diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-01-14 15:51:57 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-01-14 15:51:57 +0000 |
commit | ff1aa7ce9021d00e53fd647b30878f59278ecf94 (patch) | |
tree | 5c042f2c8d09de0a494f664346bb2ddaa2e94f4c /utils | |
parent | d23c49221a13a57ba041ec6091ab510a912b8105 (diff) |
- make sure not to have relocs in Scrt1.o (Peter S. Mazinger)
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Makefile.in | 14 |
1 files changed, 9 insertions, 5 deletions
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) |