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). --- localedata/ChangeLog | 4 ++++ localedata/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 68aab86..e5d0ae3 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Joseph Myers + + * Makefile (LOCALEDEF): Use $(rtld-prefix). + 2014-06-09 Joseph Myers * Makefile (test-srcs): Remove tst-mbswcs1, tst-mbswcs2, diff --git a/localedata/Makefile b/localedata/Makefile index 76eeedf..023f443 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -216,7 +216,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) # Sometimes the whole collection of locale files should be installed. LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ -$(elf-objpfx)ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef +$(rtld-prefix) $(common-objpfx)locale/localedef install-locales: $(INSTALL-SUPPORTED-LOCALES) install-locales-dir: -- cgit v1.1