X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=7e2b69acbc43aca910fa868203e1a46b7c07a316;hb=e6f8e7e99e202076206c1ad551634a5f15cb1a55;hp=e5359335ec5adbfa3e34d3157ecedb6d8b126c56;hpb=f1fc55cda8af49e9eeb155dd536d4419a8c8d0ca;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index e535933..7e2b69a 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Written by Uwe Hermann <uwe@hermann-uwe.de>, released as public domain.
 # Modified by Piotr Esden-Tempski <piotr@esden.net>, released as public domain.
 
@@ -13,33 +13,41 @@ set -e
 # Settings section
 # You probably want to customize those
 ##############################################################################
-TARGET=arm-eabi		# Or: TARGET=arm-elf
-PREFIX=${HOME}/arm	# Install location of your final toolchain
+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
 # Set to 'sudo' if you need superuser privileges while installing
 SUDO=''
 # Set to 1 to be quieter while running
-QUIET=1
+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=1
+OOCD_EN=0
 # Set to 1 to build libstm32 provided by ST
 LIBSTM32_EN=0
 # Set to 1 to build libopenstm32 an open source library for stm32
-LIBOPENSTM32_EN=1
+LIBOPENSTM32_EN=0
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=1
 
 ##############################################################################
 # Version and download url settings section
 ##############################################################################
-if [ ${USE_LINARO} == 0 ] ; then
+if [ ${USE_LINARO} = 0 ] ; then
 	# For FSF GCC:
-	GCCVERSION=4.5.1
-	GCC=gcc-${GCCVERSION}
-        GCCDIR=${GCC}
-	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
+	GCCVERSION=4.6.1
+        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
@@ -73,7 +81,7 @@ echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 GDBFLAGS=
 BINUTILFLAGS=
 
-if [ ${DEFAULT_TO_CORTEX_M3} == 0 ] ; then
+if [ ${DEFAULT_TO_CORTEX_M3} = 0 ] ; then
 	GCCFLAGS=
 else
 	# To default to the Cortex-M3:
@@ -95,7 +103,7 @@ fi
 
 export PATH="${PREFIX}/bin:${PATH}"
 
-SUMMON_DIR=$(pwd)
+SUMMON_DIR=${WORKDIR}
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
 
@@ -154,7 +162,7 @@ esac
 ##############################################################################
 
 # Fetch a versioned file from a URL
-function fetch {
+fetch() {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
         wget -c $2
@@ -163,14 +171,14 @@ function fetch {
 }
 
 # Log a message out to the console
-function log {
+log() {
     echo "******************************************************************"
     echo "* $*"
     echo "******************************************************************"
 }
 
 # Unpack an archive
-function unpack {
+unpack() {
     log Unpacking $*
     # Use 'auto' mode decompression.  Replace with a switch if tar doesn't support -a
     ARCHIVE=$(ls ${SOURCES}/$1.tar.*)
@@ -193,12 +201,17 @@ function unpack {
 }
 
 # Install a build
-function install {
+install() {
     log $1
     ${SUDO} make ${MAKEFLAGS} $2 $3 $4 $5 $6 $7 $8
 }
 
-
+if [ ! -d $SUMMON_DIR ]; then
+    mkdir -p ${SUMMON_DIR}
+    SUMMON_DIR_CREATED=1
+else
+    SUMMON_DIR_CREATED=0
+fi
 mkdir -p ${STAMPS} ${SOURCES}
 
 cd ${SOURCES}
@@ -349,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 \
@@ -476,3 +489,8 @@ if [ ! -e ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build ]; then
     rm -rf libopenstm32-${LIBOPENSTM32}
 fi
 fi
+
+if [ ${SUMMON_DIR_CREATED} = 1 ]; then
+    log "Removing work directory"
+    rm -rf ${SUMMON_DIR}
+fi