Should fix the problem with hanging CFLAGS and LDFLAGS of OOCD.

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

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2dfbd7c0acf0561dbb52db09d6eb4d129efeaf54..ff196e89640564fdc921d86fc8930f28d12570cd 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -26,13 +26,13 @@ SUDO=
 # Set to 1 to be quieter while running
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
-USE_LINARO=0
+USE_LINARO=1
 # Set to 1 to enable building of OpenOCD
 OOCD_EN=1
 # 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=0
+LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
 
@@ -383,8 +383,8 @@ if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
     unpack openocd-${OOCD}
     cd build
     log "Configuring openocd-${OOCD}"
-    export CFLAGS="${OOCD_CFLAGS}"
-    export LDFLAGS="${OOCD_LDFLAGS}"
+    CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \
+    LDFLAGS="${LDFLAGS} ${OOCD_LDFLAGS}" \
     ../openocd-${OOCD}/configure --enable-maintainer-mode \
                       --prefix=${PREFIX} \
                       --enable-dummy \