X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=e28f072b3647b5cb9812a45403a49584cd901627;hb=22bfe5834301bd434d65a7d5fc8fb06307c23213;hp=c97e5f85a4a173a8fd611e69ffd2380034e42125;hpb=a82cc53f09a9ed18a7e9dc6c6f65554252e2eb63;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index c97e5f8..e28f072 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -4,6 +4,7 @@
 
 # adapted for r0ket <http://r0ket.badge.events.ccc.de> development by
 # Matthias Rampke <matthias@rampke.de>
+# requires Homebrew <https://mxcl.github.com/homebrew>
 
 # Stop if any command fails
 set -e
@@ -12,39 +13,48 @@ 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
-DARWIN_CELLAR=$(brew --cellar)	# Path in which MacPorts or Fink is installed
 # 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}
-	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
-	GCCVERSION=${GCCRELEASE}
-	GCC=gcc-linaro-${GCCVERSION}
-	GCCURL=http://launchpad.net/gcc-linaro/4.5/${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
@@ -71,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:
@@ -93,7 +103,7 @@ fi
 
 export PATH="${PREFIX}/bin:${PATH}"
 
-SUMMON_DIR=$(pwd)
+SUMMON_DIR=${WORKDIR}
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
 
@@ -116,14 +126,14 @@ case "$(uname)" in
 	echo "Found Darwin OS."
 
 	# darwin dependencies
-	DARWINDEPS="gnu-tar wget mpfr libmpc gmp"
+	DARWINDEPS="wget mpfr libmpc gmp"
   DARWINDEPSCOUNT=4
 
-  echo "Installing dependencies"
+  echo "Installing dependencies ..."
   if ! which brew > /dev/null; then
-    echo "homebrew not installed."
+    echo "Homebrew not installed."
   else
-    brew install ${DARWINDEPS} | grep -v '^Warning: Formula already installed: '
+      brew install ${DARWINDEPS} | (grep -v '^Warning: Formula already installed: ' || true)
   fi
 
   GCCFLAGS="${GCCFLAGS} \
@@ -155,7 +165,7 @@ esac
 function fetch {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
-        wget -c --no-passive-ftp $2
+        wget -c $2
         touch ${STAMPS}/$1.fetch
     fi
 }
@@ -196,7 +206,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 +311,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 +331,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,11 +362,11 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
-    ../${GCC}/configure --target=${TARGET} \
+    [ ${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 \
@@ -366,7 +381,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 +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