- make sure not to have relocs in Scrt1.o (Peter S. Mazinger)

2 files changed, 9 insertions, 13 deletions

diff --git a/Rules.mak b/Rules.mak
index 481b35e24..847d04c89 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -423,22 +423,14 @@ endif
 
 # 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
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 76e7ab451..966821e1f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -10,24 +10,28 @@
 CFLAGS-utils := -DNOT_IN_libc $(SSP_ALL_CFLAGS) \
     -B$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
 
-pie := $(PIEFLAG) $(LDPIEFLAG)
+ifeq ($(UCLIBC_BUILD_PIE),y)
+CFLAGS-utils-shared := $(PIEFLAG) $(LDPIEFLAG)
+else
+CFLAGS-utils-shared :=
+endif
 
 CFLAGS-ldconfig := -I$(top_srcdir)ldso/include \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=$(UCLIBC_LDSO)
 ifeq ($(UCLIBC_STATIC_LDCONFIG),y)
 CFLAGS-ldconfig += -static
 else
-CFLAGS-ldconfig += $(pie)
+CFLAGS-ldconfig += $(CFLAGS-utils-shared)
 endif
 
 CFLAGS-ldd := -I$(top_srcdir)ldso/include \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-    $(pie)
+    $(CFLAGS-utils-shared)
 
-CFLAGS-readelf := $(pie)
+CFLAGS-readelf := $(CFLAGS-utils-shared)
 
 # Need CFLAGS-utils explicitly, because the source file is not located in utils
-CFLAGS-iconv := $(CFLAGS-utils) $(pie) -DL_iconv_main
+CFLAGS-iconv := $(CFLAGS-utils) $(CFLAGS-utils-shared) -DL_iconv_main
 CFLAGS-locale := $(CFLAGS-utils)