HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 496d607d JN |
1 | This fixes linking libfstest/test-fcntl (and others). |
| 2 | ||
| 3 | As discussed with upstream: https://lists.gnu.org/archive/html/bug-hurd/2020-03/msg00018.html | |
| 4 | ||
| 5 | From 96a9f67a8685e713f25259c18306797d54cc27a5 Mon Sep 17 00:00:00 2001 | |
| 6 | From: Jan Nieuwenhuizen <janneke@gnu.org> | |
| 7 | Date: Sat, 14 Mar 2020 11:28:31 +0100 | |
| 8 | Subject: [PATCH] build: Fix cross build on Guix. | |
| 9 | ||
| 10 | As discussed in https://lists.gnu.org/archive/html/bug-hurd/2020-03/msg00018.html. | |
| 11 | ||
| 12 | * Makeconf (lpath): Add -Wl,-rpath-link=<dir> next to -L<dir>. | |
| 13 | --- | |
| 14 | Makeconf | 3 ++- | |
| 15 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 16 | ||
| 17 | diff --git a/Makeconf b/Makeconf | |
| 18 | index 67f7ab1c..f68ff6e3 100644 | |
| 19 | --- a/Makeconf | |
| 20 | +++ b/Makeconf | |
| 21 | @@ -325,7 +325,8 @@ _libsubst=${libsubst$(patsubst %,-override,${libsubst-override})} | |
| 22 | ||
| 23 | # Direct the linker where to find shared objects specified in the | |
| 24 | # dependencies of other shared objects it encounters. | |
| 25 | -lpath := -L. $(patsubst %,-L%,$(dir $(wildcard ../lib*/lib*.so))) | |
| 26 | +lib_dirs := $(dir $(wildcard ../lib*/lib*.so)) | |
| 27 | +lpath := -L. $(lib_dirs:%=-L%) $(lib_dirs:%=-Wl,-rpath-link=%) | |
| 28 | ||
| 29 | # Main rule to link executables | |
| 30 | # | |
| 31 | -- | |
| 32 | 2.24.0 | |
| 33 |