diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-07-22 13:43:39 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-07-22 13:43:39 +0000 |
| commit | c837cf0bbdd09079d64188bf0028bb21df2faec7 (patch) | |
| tree | d3ead9b4b8d60f25f78b12417b2ba02f14971704 /libc/Makefile | |
| parent | a63bdad03a9963d53373008e78fc29ee48f161af (diff) | |
Merge changes between 14282 and r14661 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@14662 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/Makefile')
| -rw-r--r-- | libc/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile index 020bb9266..c438e1313 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -152,7 +152,7 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \ $(elfobjdir)/sofini.os \ $(elfobjdir)/interp.os \ $(elfobjdir)/ld.so \ - $(common-objpfx)shlib.lds + $(shlib-lds) $(build-shlib) $(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \ @@ -172,8 +172,10 @@ endif $(common-objpfx)testrun.sh: $(common-objpfx)config.make \ $(..)Makeconfig $(..)Makefile (echo '#!/bin/sh'; \ - echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \ - echo 'exec $(run-program-prefix) $${1+"$$@"}'; \ + echo 'builddir=`dirname "$$0"`'; \ + echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \ + echo 'exec $(subst $(common-objdir),"$${builddir}",\ + $(run-program-prefix)) $${1+"$$@"}'; \ ) > $@T chmod a+x $@T mv -f $@T $@ @@ -304,7 +306,8 @@ endif endif $(objpfx)check-local-headers.out: scripts/check-local-headers.sh - scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" > $@ + AWK='$(AWK)' scripts/check-local-headers.sh \ + "$(includedir)" "$(objpfx)" > $@ ifneq ($(PERL),no) installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \ |