Try new host toolchain
Fallback to the previous host toolchain if new one
can't be found.
Change-Id: Id7bba0bdc9ff4a691235937535907316ff83156a
Conflicts:
android/kernel/kernel_utils.cpp
diff --git a/android-configure.sh b/android-configure.sh
index bfda5e2..1c1ab0a 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -106,7 +106,10 @@
# On Linux, try to use our prebuilt toolchain to generate binaries
# that are compatible with Ubuntu 8.04
if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux ] ; then
- PROBE_HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
+ PROBE_HOST_CC=`dirname $0`/../../prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-gcc
+ if [ ! -f "$PROBE_HOST_CC" ] ; then
+ PROBE_HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
+ fi
if [ -f "$PROBE_HOST_CC" ] ; then
echo "Using prebuilt toolchain: $PROBE_HOST_CC"
CC="$PROBE_HOST_CC"