From 9c6a7e927aa4f52d04d8f573e4ea3ea3aaaf061e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 24 May 2014 13:54:33 +0200
Subject: fix build with ssp enabled

---
 toolchain/glibc/Makefile     | 4 ++--
 toolchain/glibc/Makefile.inc | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'toolchain')

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} \
-- 
cgit v1.2.3