Shifted some variables about to allow a better override from local.sh

[fw/cortex-toolchain] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 9eeceb15509d37e6deafe42d65f0fc389de4df8a..03d5d4833dfa38a7bae451adad25e647bffed2f3 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -8,6 +8,8 @@
 # apt-get install flex bison libgmp3-dev libmpfr-dev libncurses5-dev \
 # libmpc-dev autoconf texinfo build-essential
 #
+# Or on Ubuntu Maverick give `apt-get build-dep gcc-4.5` a try.
+#
 
 # Stop if any command fails
 set -e
@@ -19,7 +21,7 @@ DARWIN_OPT_PATH=/opt/local    # 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
 
 # For FSF GCC:
 GCCVERSION=4.5.1
@@ -41,9 +43,17 @@ LIBOPENSTM32=master
 LIBSTM32_EN=0
 LIBOPENSTM32_EN=0
 
-SUMMON_DIR=$(pwd)
-SOURCES=${SUMMON_DIR}/sources
-STAMPS=${SUMMON_DIR}/stamps
+GCCFLAGS=
+GDBFLAGS=
+BINUTILFLAGS=
+
+# To default to the Cortex-M3:
+# GCCFLAGS="--with-arch=armv7-m --with-mode=thumb"
+
+# Pull in the local configuration, if any
+if [ -f local.sh ]; then
+    . ./local.sh
+fi
 
 MAKEFLAGS=${PARALLEL}
 TARFLAGS=v
@@ -55,12 +65,9 @@ fi
 
 export PATH="${PREFIX}/bin:${PATH}"
 
-GCCFLAGS=
-GDBFLAGS=
-BINUTILFLAGS=
-
-# To default to the Cortex-M3:
-# GCCFLAGS="--with-arch=armv7-m --with-mode=thumb"
+SUMMON_DIR=$(pwd)
+SOURCES=${SUMMON_DIR}/sources
+STAMPS=${SUMMON_DIR}/stamps
 
 # Fetch a versioned file from a URL
 function fetch {