X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=151e77611cb21349a24b0458eca39f6bfa8fa9a6;hb=c38956688f42ad71e10d0527900d6418e5897389;hp=708869c7383b2fe885edd75cbe71a97ddca97e86;hpb=c3490ef1da19fbcfbf08dbe0fff32809e3025203;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 708869c..151e776 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -14,20 +14,21 @@ set -e
 # You probably want to customize those
 ##############################################################################
 TARGET=arm-eabi		# Or: TARGET=arm-elf
-PREFIX=${HOME}/arm	# Install location of your final toolchain
+[ -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
 # 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
 
@@ -36,15 +37,17 @@ DEFAULT_TO_CORTEX_M3=1
 ##############################################################################
 if [ ${USE_LINARO} == 0 ] ; then
 	# For FSF GCC:
-	GCCVERSION=4.5.1
-	GCC=gcc-${GCCVERSION}
-	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
+	GCCVERSION=4.6.1
+	GCC=gcc-core-${GCCVERSION}
+        GCCDIR=gcc-${GCCVERSION}
+	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCCDIR}/${GCC}.tar.gz
 else
 	# For the Linaro GCC:
 	GCCRELEASE=4.6-2011.07
-	GCCVERSION=${GCCRELEASE}
-	GCC=gcc-linaro-${GCCVERSION}
-	GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/${GCC}.tar.bz2
+	GCCVERSION=4.6-2011.07-0
+        GCC=gcc-linaro-${GCCRELEASE}
+	GCCDIR=gcc-linaro-${GCCVERSION}
+	GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/gcc-linaro-${GCCRELEASE}.tar.bz2
 fi
 
 BINUTILS=binutils-2.21
@@ -93,7 +96,7 @@ fi
 
 export PATH="${PREFIX}/bin:${PATH}"
 
-SUMMON_DIR=$(pwd)
+SUMMON_DIR=${WORKDIR}
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
 
@@ -196,7 +199,12 @@ function install {
     ${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}
@@ -296,7 +304,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
     unpack ${GCC} boot
     cd build
     log "Configuring ${GCC}-boot"
-    ../${GCC}/configure --target=${TARGET} \
+    ../${GCCDIR}/configure --target=${TARGET} \
                       --prefix=${PREFIX} \
                       --enable-interwork \
                       --enable-multilib \
@@ -316,7 +324,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
     cd ..
     log "Cleaning up ${GCC}-boot"
     touch ${STAMPS}/${GCC}-boot.build
-    rm -rf build/* ${GCC}
+    rm -rf build/* ${GCCDIR}
 fi
 
 if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
@@ -347,7 +355,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
-    ../${GCC}/configure --target=${TARGET} \
+    ../${GCCDIR}/configure --target=${TARGET} \
                       --prefix=${PREFIX} \
                       --enable-interwork \
                       --enable-multilib \
@@ -366,7 +374,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     cd ..
     log "Cleaning up ${GCC}"
     touch ${STAMPS}/${GCC}.build
-    rm -rf build/* ${GCC}
+    rm -rf build/* ${GCCDIR}
 fi
 
 if [ ! -e ${STAMPS}/${GDB}.build ]; then
@@ -474,3 +482,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