aboutsummaryrefslogtreecommitdiffstats
path: root/android-configure.sh
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-09 15:07:03 -0800
committerJean-Baptiste Queru <jbq@google.com>2012-01-11 06:30:25 -0800
commit6e8d9298782ce4d5a7d506638ced4de0396735f9 (patch)
tree2cae4b744896a001e05c30bf6bb9c0013422f38a /android-configure.sh
parentbc456c52dcb71007841b734195f712191012c537 (diff)
downloadexternal_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.zip
external_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.tar.gz
external_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.tar.bz2
Reference new location of SDK toolchain
Change-Id: Id28db802a5401141a5ec1052de81dbee5033577f
Diffstat (limited to 'android-configure.sh')
-rwxr-xr-xandroid-configure.sh6
1 files changed, 5 insertions, 1 deletions
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"