X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=7665da6c336dbf687b047ae46ac7174628ef2cdd;hb=83927de4958dc02ec0c7d8dddd151328b6a16613;hp=b0b434f753986a8d4808d18dd3f5d34f6ec945cd;hpb=2149df994dfda3ca887baf11f13a16dd1da411e0;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index b0b434f..7665da6 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -14,17 +14,17 @@ 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
-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
 # 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
@@ -39,13 +39,15 @@ 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
 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
@@ -117,14 +119,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} \
@@ -156,7 +158,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
 }
@@ -297,7 +299,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 \
@@ -317,7 +319,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
@@ -348,7 +350,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 \
@@ -367,7 +369,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