Fixed libiconv location parameter. Thanks Bernard Davison!

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

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2a12296a9531dc6197046c362d728e7538d90f01..d77d3a50a075ceffa68e71d0932408d8aa2ed5c3 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -123,7 +123,7 @@ case "$(uname)" in
                   --with-gmp=${DARWIN_OPT_PATH} \
                  --with-mpfr=${DARWIN_OPT_PATH} \
                  --with-mpc=${DARWIN_OPT_PATH} \
-                 -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+                 --with-libiconv-prefix=${DARWIN_OPT_PATH}"
        OOCD_CFLAGS="-m32 -I/opt/mine/include -I/opt/local/include"
        OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
        ;;
@@ -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 \