diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 13:54:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 13:55:01 +0200 |
| commit | 9c6a7e927aa4f52d04d8f573e4ea3ea3aaaf061e (patch) | |
| tree | fde9ea6cb348a5b74e6da6b7446ea220c1840116 | |
| parent | 086da7a91ef0a4fbf5ae524923475ae15e7e6f37 (diff) | |
fix build with ssp enabled
| -rw-r--r-- | package/glibc/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 9fa4cf7bb..acf7d86f9 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -2,10 +2,6 @@ # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk - -TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS)) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - include $(TOPDIR)/toolchain/glibc/Makefile.inc PKG_NAME:= glibc @@ -47,7 +43,6 @@ glibc-static-install: $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_GLIBC_STATIC)/usr/lib glibc-dev-install: - echo $(TARGET_CFLAGS) ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib # install linker script cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 0910bc72d..b095c4ab5 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -10,8 +10,8 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+= -O2 endif -# ssp partially supported -TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS)) +# ssp unsupported +TARGET_CFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 72b51d254..f5f397d35 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -20,6 +20,8 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --with-tls \ --enable-kernel="2.6.32" \ --enable-add-ons +TARGET_CFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) +TARGET_LDFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_LDFLAGS)) GLIBC_ENV:= PATH='${TARGET_PATH}' \ CONFIG_SHELL='$(strip ${SHELL})' \ BUILD_CC=${CC_FOR_BUILD} \ |