AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 15:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use $(rtld-prefix) more consistently.

Browse Source 
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).
This commit is contained in:
Joseph Myers 2014-06-18 10:35:29 +00:00
parent 754c5a08aa
commit 85d8927856
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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]

3
elf/Makefile
View File

@ -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)

2
iconvdata/Makefile
View File

@ -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

4
localedata/ChangeLog
View File

@ -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,

2
localedata/Makefile
View File

@ -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:

2
sysdeps/s390/s390-64/Makefile
View File

@ -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