about summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-13 19:37:41 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-16 21:15:20 +0000
commit3dbbd2ff92b1a0a2465461ee049e3e2813b73fa4 (patch)
treeeeb38010eb00265c4899cc127f90bbc3e52a89ac /elf/Makefile
parent1daccf403b1bd86370eb94edca794dc106d02039 (diff)
downloadglibc-3dbbd2ff92b1a0a2465461ee049e3e2813b73fa4.tar.gz
glibc-3dbbd2ff92b1a0a2465461ee049e3e2813b73fa4.tar.xz
glibc-3dbbd2ff92b1a0a2465461ee049e3e2813b73fa4.zip
Add {,sysdep-}ld-library-path make variable
On GNU/Hurd we not only need $(common-objpfx) in LD_LIBRARY_PATH when loading
dynamic objects, but also $(common-objpfx)/mach and $(common-objpfx)/hurd. This
adds an ld-library-path variable to be used as LD_LIBRARY_PATH basis in
Makefiles, and a sysdep-ld-library-path variable for sysdeps to add some
more paths, here mach/ and hurd/.
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 2015383eb2..a494b14519 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -180,7 +180,7 @@ tests-static := $(tests-static-normal) $(tests-static-internal)
 ifeq (yes,$(build-shared))
 tests-static += tst-tls9-static tst-single_threaded-static-dlopen
 static-dlopen-environment = \
-  LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn
+  LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)dlfcn
 tst-tls9-static-ENV = $(static-dlopen-environment)
 tst-single_threaded-static-dlopen-ENV = $(static-dlopen-environment)
 
@@ -1671,7 +1671,7 @@ $(objpfx)tst-libc_dlvsym-dso.so: $(libsupport) $(libdl)
 $(objpfx)tst-libc_dlvsym.out: $(objpfx)tst-libc_dlvsym-dso.so
 $(objpfx)tst-libc_dlvsym-static: $(common-objpfx)dlfcn/libdl.a
 tst-libc_dlvsym-static-ENV = \
-  LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn
+  LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)dlfcn
 $(objpfx)tst-libc_dlvsym-static.out: $(objpfx)tst-libc_dlvsym-dso.so
 
 $(objpfx)tst-big-note: $(objpfx)tst-big-note-lib.so