summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-29 17:58:37 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-29 17:58:51 +0200
commit4a00cc7dc30b2bb5efcf1ed955d9710ab7655167 (patch)
treeadcb2208cfc5d230f7880f705ecc587de6c6d5ae /toolchain
parent014f5aac68d56ef7a29bcd07621b34992a0a3267 (diff)
make libssp shared, when SSP used
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index c1b2ada9e..198b9b4ec 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
include ../rules.mk
-TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
+SHARED_LIBS:= 'libstdc++'
include Makefile.inc
@@ -67,6 +67,7 @@ endif
ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y)
GCC_FINAL_CONFOPTS+= --enable-libssp
+SHARED_LIBS:= 'libstdc++,libssp'
else
GCC_FINAL_CONFOPTS+= --disable-libssp
endif
@@ -196,7 +197,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
--enable-languages=$(LANGUAGES) \
--with-build-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
--with-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
- --enable-shared='libstdc++' \
+ --enable-shared='${SHARED_LIBS}' \
--enable-cxx-flags='$(TARGET_CXXFLAGS)'
touch $@