From 85d89278568b4191da3b2fee589553e90b54ffa5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 18 Jun 2014 10:35:29 +0000 Subject: Use $(rtld-prefix) more consistently. The glibc makefiles have a standard variable, $(rtld-prefix), to run the dynamic linker with a default --library-path option; this is used as the basis of lots of other variables for running programs compiled with the newly built library. A few places however use $(elf-objpfx)ld.so or $(elf-objpfx)${rtld-installed-name} directly, with such a --library-path option. This patch makes such places use $(rtld-prefix) instead. I'm not aware of any significance in these cases to the choice of ld.so or ${rtld-installed-name} when running the dynamic linker, or to whether $(patsubst %,:%,$(sysdep-library-path)) is included in the library-path as it is in $(rtld-prefix) and just one of the places being changed. Tested x86_64. * elf/Makefile ($(objpfx)tst-unused-dep.out): Use $(rtld-prefix). * iconvdata/Makefile ($(inst_gconvdir)/gconv-modules) [$(cross-compiling) = no]: Likewise. * sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules) [$(cross-compiling) = no]: Likewise. localedata/ChangeLog: * Makefile (LOCALEDEF): Use $(rtld-prefix). --- elf/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index a2f5ce5c47..6602ed5cf3 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1155,8 +1155,7 @@ $(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so LD_TRACE_LOADED_OBJECTS=1 \ LD_DEBUG=unused \ LD_PRELOAD= \ - $(elf-objpfx)${rtld-installed-name} \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(rtld-prefix) \ $< > $@; \ $(evaluate-test) -- cgit 1.4.1