about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-05-21 16:52:08 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-05-21 16:52:08 +0000
commit4134b50d6789c333707b1861a32314805bd0de5e (patch)
tree9500332a208274a6a014485eae02b1a9bf26a6f9 /localedata
parenta6b3657be6bc5067aeec98d990f60765361c6557 (diff)
downloadglibc-4134b50d6789c333707b1861a32314805bd0de5e.tar.gz
glibc-4134b50d6789c333707b1861a32314805bd0de5e.tar.xz
glibc-4134b50d6789c333707b1861a32314805bd0de5e.zip
Consistently use $(elf-objpfx).
As previously noted
<https://sourceware.org/ml/libc-alpha/2013-05/msg00696.html>,
$(elf-objpfx) and $(elfobjdir) are redundant and should be
consolidated.  This patch consolidates on $(elf-objpfx) (for
consistency with $(csu-objpfx)), also changing direct uses of
$(common-objpfx)elf/ to use $(elf-objpfx).

Tested x86_64, including that installed shared libraries are unchanged
by the patch.

	* Makeconfig [$(build-hardcoded-path-in-tests) = yes]
	(rtld-tests-LDFLAGS): Use $(elf-objpfx) instead of
	$(common-objpfx)elf/.
	(link-libc-before-gnulib): Likewise.
	(elfobjdir): Remove variable.
	* Makefile (install): Use $(elf-objpfx) instead of
	$(common-objpfx)elf/.
	* Makerules (link-libc-args): Use $(elf-objpfx) instead of
	$(elfobjdir)/.
	(link-libc-deps): Likewise.
	($(common-objpfx)libc.so): Likewise.
	($(common-objpfx)linkobj/libc.so): Likewise.
	[$(cross-compiling) = no] (symbolic-link-prog): Use $(elf-objpfx)
	instead of $(common-objpfx)elf/.
	(symbolic-link-list): Likewise.
	* iconvdata/Makefile ($(inst_gconvdir)/gconv-modules)
	[$(cross-compiling) = no]: Likewise.
	* sysdeps/arm/Makefile (gnulib-arch): Use $(elf-objpfx) instead of
	$(elfobjdir)/.
	(static-gnulib-arch): Likewise.
	* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules)
	[$(cross-compiling) = no]: Use $(elf-objpfx) instead of
	$(common-objpfx)elf/.

localedata/ChangeLog:
	* Makefile (LOCALEDEF): Use $(elf-objpfx) instead of
	$(common-objpfx)elf/.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7db10fb9ef..35dd877a9e 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile (LOCALEDEF): Use $(elf-objpfx) instead of
+	$(common-objpfx)elf/.
+
 2014-03-07  Joseph Myers  <joseph@codesourcery.com>
 
 	* Makefile (LOCALES): Move definition above include of Rules.
diff --git a/localedata/Makefile b/localedata/Makefile
index 48ec3de9c9..d7ab445676 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 \
-$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
+$(elf-objpfx)ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
 install-locales: $(INSTALL-SUPPORTED-LOCALES)
 
 install-locales-dir: