aboutsummaryrefslogtreecommitdiffstats
path: root/android-configure.sh
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-11 09:00:27 -0800
committerJean-Baptiste Queru <jbq@google.com>2012-01-11 09:00:27 -0800
commitaa1af37d8b3c3a21eb4cac4a225225425b50d08c (patch)
tree6c327d608351367bb3ea50d40823d05ce698faba /android-configure.sh
parent6e8d9298782ce4d5a7d506638ced4de0396735f9 (diff)
downloadexternal_qemu-aa1af37d8b3c3a21eb4cac4a225225425b50d08c.zip
external_qemu-aa1af37d8b3c3a21eb4cac4a225225425b50d08c.tar.gz
external_qemu-aa1af37d8b3c3a21eb4cac4a225225425b50d08c.tar.bz2
Revert "Reference new location of SDK toolchain"
This reverts commit 6e8d9298782ce4d5a7d506638ced4de0396735f9.
Diffstat (limited to 'android-configure.sh')
-rwxr-xr-xandroid-configure.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/android-configure.sh b/android-configure.sh
index 638c8cf..6d25d20 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -119,11 +119,7 @@ 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
- 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
+ HOST_CC=`dirname $0`/../../prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux-gcc
if [ -f "$HOST_CC" ] ; then
echo "Using prebuilt 32-bit toolchain: $HOST_CC"
CC="$HOST_CC"