about summary refs log tree commit diff
path: root/iconvdata/Makefile
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 /iconvdata/Makefile
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 'iconvdata/Makefile')
-rw-r--r--iconvdata/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 424e8ee049..0a410a1bc8 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -252,7 +252,7 @@ ifeq (no,$(cross-compiling))
 # if this libc has more gconv modules than the previously installed one.
 	if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
 	   LC_ALL=C \
-	   $(elf-objpfx)ld.so --library-path $(rpath-link) \
+	   $(rtld-prefix) \
 	   $(common-objpfx)iconv/iconvconfig \
 	     $(addprefix --prefix=,$(install_root)); \
 	fi