From: Matthias Rampke <matthias@rampke.de>
Date: Fri, 12 Aug 2011 13:51:02 +0000 (+0200)
Subject: make C++ support configurable
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=summon-arm-toolchain.git;a=commitdiff_plain;h=5dcde2b8d6434075558c76724e0069100d0ead46

make C++ support configurable

it's not in the FSF GCC core package
---

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 151e776..e740827 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -23,6 +23,8 @@ SUDO=''
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
 USE_LINARO=1
+# Set to 1 to enable C++
+USE_CPP=0
 # Set to 1 to enable building of OpenOCD
 OOCD_EN=0
 # Set to 1 to build libstm32 provided by ST
@@ -38,9 +40,14 @@ DEFAULT_TO_CORTEX_M3=1
 if [ ${USE_LINARO} == 0 ] ; then
 	# For FSF GCC:
 	GCCVERSION=4.6.1
-	GCC=gcc-core-${GCCVERSION}
-        GCCDIR=gcc-${GCCVERSION}
-	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCCDIR}/${GCC}.tar.gz
+        if [ ${USE_CPP} == 0 ]; then
+            GCC=gcc-core-${GCCVERSION}
+            GCCDIR=gcc-${GCCVERSION}
+        else
+            GCC=gcc-${GCCVERSION}
+            GCCDIR=${GCC}
+        fi
+        GCCURL=http://ftp.gnu.org/gnu/gcc/${GCCDIR}/${GCC}.tar.gz
 else
 	# For the Linaro GCC:
 	GCCRELEASE=4.6-2011.07
@@ -355,11 +362,11 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
+    [ ${USE_CPP} == 1 ] && GCCFLAGS="--enable-languages='c,c++' ${GCCFLAGS}"
     ../${GCCDIR}/configure --target=${TARGET} \
                       --prefix=${PREFIX} \
                       --enable-interwork \
                       --enable-multilib \
-                      --enable-languages="c,c++" \
                       --with-newlib \
                       --disable-shared \
                       --with-gnu-as \