diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-06-18 10:35:29 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-18 10:35:29 +0000 |
| commit | 85d89278568b4191da3b2fee589553e90b54ffa5 (patch) | |
| tree | fd3e4b30646d3ace7070e1565ff897eeb025ed25 | |
| parent | 754c5a08aacb44895d1ab97c553ce424eb43f761 (diff) | |
| download | glibc-85d89278568b4191da3b2fee589553e90b54ffa5.tar.gz | |
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).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | iconvdata/Makefile | 2 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/Makefile | 2 |
6 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2014-06-18 Joseph Myers <joseph@codesourcery.com> + + * 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. + 2014-16-17 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com> [BZ #17031] 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) 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 diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 68aab8695f..e5d0ae337f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Joseph Myers <joseph@codesourcery.com> + + * Makefile (LOCALEDEF): Use $(rtld-prefix). + 2014-06-09 Joseph Myers <joseph@codesourcery.com> * Makefile (test-srcs): Remove tst-mbswcs1, tst-mbswcs2, diff --git a/localedata/Makefile b/localedata/Makefile index 76eeedf809..023f443206 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: diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile index 4e69e90378..fe5030efab 100644 --- a/sysdeps/s390/s390-64/Makefile +++ b/sysdeps/s390/s390-64/Makefile @@ -77,7 +77,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 |