From d3b021b5410aeb3f62a7225dccb3f6f2617d4c38 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Jan 2011 16:59:51 +0100
Subject: add toolchain settings menu point

- gdb compilation can be disabled
- gcc languages (c++/java) can be enabled/disabled
- gcc stack smashing protection can be enabled/disabled
---
 toolchain/gcc/Makefile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7e806c68c..3c160d4f4 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -19,7 +19,6 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--disable-decimal-float \
 			--disable-multilib \
 			--disable-sjlj-exceptions \
-			--disable-libssp \
 			--disable-libstdcxx-pch \
 			--disable-ppl-version-check \
 			--disable-cloog-version-check \
@@ -27,6 +26,12 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--without-cloog \
 			--disable-nls
 
+ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y)
+GCC_CONFOPTS+=		--enable-libssp
+else
+GCC_CONFOPTS+=		--disable-libssp
+endif
+
 ifeq ($(ARCH),cris)
 GCC_CONFOPTS+=		--disable-tls
 else
@@ -55,6 +60,14 @@ ifeq (${ADK_MAKE_PARALLEL},y)
 GCC_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
 endif
 
+LANGUAGES:=c
+ifeq ($(ADK_TOOLCHAIN_GCC_CXX),y)
+LANGUAGES:=${LANGUAGES},c++
+endif
+ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y)
+LANGUAGES:=${LANGUAGES},java
+endif
+
 include ${TOPDIR}/mk/buildhlp.mk
 
 GCC_BUILD_DIR_MINIMAL:=	$(WRKBUILD)-minimal
@@ -119,7 +132,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 		PATH='$(TARGET_PATH)' \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
-			--enable-languages=c,c++ \
+			--enable-languages=$(LANGUAGES) \
 			--with-sysroot=$(STAGING_TARGET_DIR) \
 			--with-slibdir=$(STAGING_TARGET_DIR)/lib \
 			--enable-shared \
-- 
cgit v1.2.3