summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2020-03-14 11:28:31 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-22 23:38:32 +0100
commit96a9f67a8685e713f25259c18306797d54cc27a5 (patch)
treeb3bc5b7d3a2cb217e7b3f995356bc09ecb821e66
parentd6ac4187fcb0bae48e421cdb265dd1636543a996 (diff)
build: Fix cross build on Guix.
As discussed in https://lists.gnu.org/archive/html/bug-hurd/2020-03/msg00018.html. * Makeconf (lpath): Add -Wl,-rpath-link=<dir> next to -L<dir>.
-rw-r--r--Makeconf3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makeconf b/Makeconf
index 67f7ab1ce..f68ff6e3d 100644
--- a/Makeconf
+++ b/Makeconf
@@ -325,7 +325,8 @@ _libsubst=${libsubst$(patsubst %,-override,${libsubst-override})}
# Direct the linker where to find shared objects specified in the
# dependencies of other shared objects it encounters.
-lpath := -L. $(patsubst %,-L%,$(dir $(wildcard ../lib*/lib*.so)))
+lib_dirs := $(dir $(wildcard ../lib*/lib*.so))
+lpath := -L. $(lib_dirs:%=-L%) $(lib_dirs:%=-Wl,-rpath-link=%)
# Main rule to link executables
#