about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-06-18 10:35:29 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-06-18 10:35:29 +0000
commit85d89278568b4191da3b2fee589553e90b54ffa5 (patch)
treefd3e4b30646d3ace7070e1565ff897eeb025ed25 /elf
parent754c5a08aacb44895d1ab97c553ce424eb43f761 (diff)
downloadglibc-85d89278568b4191da3b2fee589553e90b54ffa5.tar.gz
glibc-85d89278568b4191da3b2fee589553e90b54ffa5.tar.xz
glibc-85d89278568b4191da3b2fee589553e90b54ffa5.zip
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).
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile3
1 files changed, 1 insertions, 2 deletions
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)