From 6e8d9298782ce4d5a7d506638ced4de0396735f9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Mon, 9 Jan 2012 15:07:03 -0800 Subject: Reference new location of SDK toolchain Change-Id: Id28db802a5401141a5ec1052de81dbee5033577f --- android-configure.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'android-configure.sh') diff --git a/android-configure.sh b/android-configure.sh index 6d25d20..638c8cf 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -119,7 +119,11 @@ fi # On Linux, try to use our 32-bit prebuilt toolchain to generate binaries # that are compatible with Ubuntu 8.04 if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux -a "$OPTION_TRY_64" != "yes" ] ; then - HOST_CC=`dirname $0`/../../prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc + if [ -d `dirname $0`/../../prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc] ; then + HOST_CC=`dirname $0`/../../prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc + HOST_CC=`dirname $0`/../../prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc + else + fi if [ -f "$HOST_CC" ] ; then echo "Using prebuilt 32-bit toolchain: $HOST_CC" CC="$HOST_CC" -- cgit v1.1