Remove bash-ism from build-toolchain.sh

diff --git a/ndk/build/tools/build-toolchain.sh b/ndk/build/tools/build-toolchain.sh
index 95bf100..1c6b398 100755 (executable)
--- a/ndk/build/tools/build-toolchain.sh
+++ b/ndk/build/tools/build-toolchain.sh
@@ -21,7 +21,7 @@
 #
 
 # include common function and variable definitions
-source `dirname $0`/../core/ndk-common.sh
+. `dirname $0`/../core/ndk-common.sh
 
 # number of jobs to run in parallel when running make
 JOBS=$HOST_NUM_CPUS
@@ -424,9 +424,9 @@ if ! timestamp_check gdbserver configure; then
     echo "Configure: gdbserver build."
     mkdir -p $GDBSERVER_BUILD
     cd $GDBSERVER_BUILD &&
-    CFLAGS="-g -O2 -static -mandroid -I$ANDROID_SYSROOT/usr/include" \
-    LDFLAGS= \
-    CC="$TOOLCHAIN_PREFIX/bin/arm-eabi-gcc" \
+    export CC="$TOOLCHAIN_PREFIX/bin/arm-eabi-gcc" &&
+    export CFLAGS="-g -O2 -static -mandroid -I$ANDROID_SYSROOT/usr/include"  &&
+    export LDFLAGS= &&
     run $TOOLCHAIN_SRC/gdb-6.6/gdb/gdbserver/configure \
     --host=arm-eabi-linux \
     --with-sysroot=$ANDROID_SYSROOT

diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 4862be6..0e4962c 100644 (file)
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -33,6 +33,9 @@ OTHER FIXES & CHANGES:
   This change is to help people easily package experimental NDK releases to
   test and distribute fixes and improvements.
 
+- Remove bash-isms from build/tools/build-toolchain.sh. Now it's possible to
+  build it with the 'dash' shell on Debian-based systems (tested on Ubuntu 8.04)
+
 -------------------------------------------------------------------------------
 android-ndk-1.6_r1