svn commit: branches/uClibc_0_9_30: utils

[aldot at uclibc.org]

Author: aldot
Date: 2009-01-14 15:54:12 +0000 (Wed, 14 Jan 2009)
New Revision: 24836

Log:
- pull r24834 from trunk (Scrt1 no relocs)


Modified:
   branches/uClibc_0_9_30/Rules.mak
   branches/uClibc_0_9_30/utils/Makefile.in


Changeset:
Modified: branches/uClibc_0_9_30/Rules.mak
===================================================================
--- branches/uClibc_0_9_30/Rules.mak	2009-01-14 15:52:20 UTC (rev 24835)
+++ branches/uClibc_0_9_30/Rules.mak	2009-01-14 15:54:12 UTC (rev 24836)
@@ -417,22 +417,14 @@
 
 # Keep the check_gcc from being needlessly executed
 ifndef PIEFLAG
-ifneq ($(UCLIBC_BUILD_PIE),y)
-export PIEFLAG:=
-else
 export PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),$(PICFLAG))
 endif
-endif
 # We need to keep track of both the CC PIE flag (above) as
 # well as the LD PIE flag (below) because we can't rely on
 # gcc passing -pie if we used -fPIE
 ifndef LDPIEFLAG
-ifneq ($(UCLIBC_BUILD_PIE),y)
-export LDPIEFLAG:=
-else
 export LDPIEFLAG:=$(shell $(LD) --help 2>/dev/null | grep -q -- -pie && echo "-Wl,-pie")
 endif
-endif
 
 # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it)
 ifndef ASNEEDED

Modified: branches/uClibc_0_9_30/utils/Makefile.in
===================================================================
--- branches/uClibc_0_9_30/utils/Makefile.in	2009-01-14 15:52:20 UTC (rev 24835)
+++ branches/uClibc_0_9_30/utils/Makefile.in	2009-01-14 15:54:12 UTC (rev 24836)
@@ -8,7 +8,10 @@
 CFLAGS-utils := -DNOT_IN_libc $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
 
 CFLAGS-utils-common := -I$(top_srcdir)ldso/include -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=$(UCLIBC_LDSO)
+CFLAGS-utils-shared :=
+ifeq ($(UCLIBC_BUILD_PIE),y)
 CFLAGS-utils-shared := $(PIEFLAG) $(LDPIEFLAG)
+endif
 
 CFLAGS-ldconfig := $(CFLAGS-utils-common)