diff --git a/android-wrapped-clang b/android-wrapped-clang
index 14dcf5d..ff40570 100755
--- a/android-wrapped-clang
+++ b/android-wrapped-clang
@@ -1 +1,9 @@
-exec $thecc "$@" -Wno-unknown-warning-option -Wno-unused-parameter -Wno-unused
+#!/bin/bash
+if [ "$1" = "--version" ]; then
+  echo "${TARGET}-gcc (GCC) 4.9 20140827 (prerelease)"
+  echo "Copyright (C) 2014 Free Software Foundation, Inc."
+  echo "This is free software; see the source for copying conditions.  There is NO"
+  echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+else
+  exec $thecc "$@"
+fi
diff --git a/android-wrapped-clang++ b/android-wrapped-clang++
index f22917d..a8e62bb 100755
--- a/android-wrapped-clang++
+++ b/android-wrapped-clang++
@@ -1 +1,9 @@
-exec $thecxx "$@" -Wno-unknown-warning-option -Wno-unused-parameter -Wno-unused
\ No newline at end of file
+#!/bin/bash
+if [ "$1" = "--version" ]; then
+  echo "${TARGET}-g++ (GCC) 4.9 20140827 (prerelease)"
+  echo "Copyright (C) 2014 Free Software Foundation, Inc."
+  echo "This is free software; see the source for copying conditions.  There is NO"
+  echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+else
+  exec $thecxx "$@"
+fi
diff --git a/buildjdk.sh b/buildjdk.sh
index 63d4b13..87b7382 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,7 +5,6 @@ set -e
 if [ "$TARGET_JDK" == "arm_DISABLEDCHECK" ]
 then
   export TARGET_JDK=aarch32
-  export TARGET_PHYS=aarch32-linux-androideabi
   export JVM_VARIANTS=client
 else
   export TARGET_PHYS=$TARGET
@@ -73,7 +72,6 @@ bash ./configure \
     --disable-warnings-as-errors \
     --enable-option-checking=fatal \
     --with-jvm-variants=$JVM_VARIANTS \
-    --with-toolchain-type=clang \
     --with-cups-include=$CUPS_DIR \
     --with-devkit=$TOOLCHAIN \
     --with-debug-level=$JDK_DEBUG_LEVEL \
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 1e5b3d4..5595bb8 100755
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -64,8 +64,8 @@ export ANDROID_INCLUDE=$TOOLCHAIN/sysroot/usr/include
 export CPPFLAGS="-I$ANDROID_INCLUDE -I$ANDROID_INCLUDE/$TARGET" # -I/usr/include -I/usr/lib
 export LDFLAGS="-L$NDK/platforms/android-$API/arch-$TARGET_SHORT/usr/lib"
 
-export thecc=$TOOLCHAIN/bin/$TARGET-clang
-export thecxx=$TOOLCHAIN/bin/$TARGET-clang++
+export thecc=$TOOLCHAIN/bin/$TARGET-gcc
+export thecxx=$TOOLCHAIN/bin/$TARGET-g++
 
 # Configure and build.
 export AR=$TOOLCHAIN/bin/$TARGET-ar