diff --git a/ndk/build/core/ndk-common.sh b/ndk/build/core/ndk-common.sh
index d456191cc..4ca36ec0b 100644
--- a/ndk/build/core/ndk-common.sh
+++ b/ndk/build/core/ndk-common.sh
@@ -135,8 +135,6 @@ case "$HOST_OS" in
         HOST_EXE=.exe
         if [ "x$OSTYPE" = xcygwin ] ; then
             HOST_OS=cygwin
-            HOST_CFLAGS="$CFLAGS -mno-cygwin"
-            HOST_LDFLAGS="$LDFLAGS -mno-cygwin"
         fi
         ;;
 esac
diff --git a/ndk/build/tools/build-toolchain.sh b/ndk/build/tools/build-toolchain.sh
index 7bed99a6c..80bb4e9a2 100755
--- a/ndk/build/tools/build-toolchain.sh
+++ b/ndk/build/tools/build-toolchain.sh
@@ -212,10 +212,35 @@ if [ "$A_MD5" != "bf072e9119077b4e76437a93986787ef" ] ; then
     exit 2
 fi
 
+# Find if a given shell program is available.
+# We need to take care of the fact that the 'which <foo>' command
+# may return either an empty string (Linux) or something like
+# "no <foo> in ..." (Darwin). Also, we need to redirect stderr
+# to /dev/null for Cygwin
+#
+# $1: variable name
+# $2: program name
+#
+# Result: set $1 to the full path of the corresponding command
+#         or to the empty/undefined string if not available
+#
+find_program ()
+{
+    local PROG
+    PROG=`which $2 2>/dev/null`
+    if [ -n "$PROG" ] ; then
+        echo "$PROG" | grep -q -e '^no '
+        if [ $? = 0 ] ; then
+            PROG=
+        fi
+    fi
+    eval $1="$PROG"
+}
+
 # And wget too
-WGET=`which wget`
-CURL=`which curl`
-SCP=`which scp`
+find_program WGET wget
+find_program CURL curl
+find_program SCP scp
 
 # download a file with either 'curl', 'wget' or 'scp'
 # $1: source
diff --git a/ndk/build/tools/download-toolchain-sources.sh b/ndk/build/tools/download-toolchain-sources.sh
index 38baf08bc..5d8332d0d 100755
--- a/ndk/build/tools/download-toolchain-sources.sh
+++ b/ndk/build/tools/download-toolchain-sources.sh
@@ -185,8 +185,9 @@ toolchain_clone mpfr
 # We only keep one version of gcc and binutils
 
 # we clearly don't need this
-log "getting rid of obsolete gcc 4.3.1 sources"
+log "getting rid of obsolete sources: gcc-4.3.1 gdb-6.8"
 rm -rf $TMPDIR/gcc/gcc-4.3.1
+rm -rf $TMPDIR/gcc/gdb-6.8
 
 # create the package
 PACKAGE=/tmp/$PKGNAME.tar.bz2