r0ket needs arm-*none*-eabi

[summon-arm-toolchain.git] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 151e77611cb21349a24b0458eca39f6bfa8fa9a6..eb2a8e2a7f8eeca4f2da326d85ddf661e74ab70f 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -13,7 +13,7 @@ set -e
 # Settings section
 # You probably want to customize those
 ##############################################################################
-TARGET=arm-eabi                # Or: TARGET=arm-elf
+TARGET=arm-none-eabi           # Or: TARGET=arm-elf
 [ -z $PREFIX ] && PREFIX=${HOME}/arm   # Install location of your final toolchain
 [ -z $WORKDIR ] && WORKDIR=$PREFIX/work     #temporary directory
 PARALLEL=                      # Or: PARALLEL="-j 5" for 4 CPUs
@@ -22,7 +22,9 @@ SUDO=''
 # Set to 1 to be quieter while running
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
-USE_LINARO=1
+USE_LINARO=0
+# 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 \