From ff1aa7ce9021d00e53fd647b30878f59278ecf94 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 14 Jan 2009 15:51:57 +0000 Subject: - make sure not to have relocs in Scrt1.o (Peter S. Mazinger) --- utils/Makefile.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'utils') 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) -- cgit v1.2.3