diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-09 15:07:03 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-11 06:30:25 -0800 |
| commit | 6e8d9298782ce4d5a7d506638ced4de0396735f9 (patch) | |
| tree | 2cae4b744896a001e05c30bf6bb9c0013422f38a | |
| parent | bc456c52dcb71007841b734195f712191012c537 (diff) | |
| download | external_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.zip external_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.tar.gz external_qemu-6e8d9298782ce4d5a7d506638ced4de0396735f9.tar.bz2 | |
Reference new location of SDK toolchain
Change-Id: Id28db802a5401141a5ec1052de81dbee5033577f
| -rw-r--r-- | Makefile.android | 6 | ||||
| -rwxr-xr-x | android-configure.sh | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.android b/Makefile.android index 22d7438..e2dccb7 100644 --- a/Makefile.android +++ b/Makefile.android @@ -95,7 +95,11 @@ ifneq ($(BUILD_STANDALONE_EMULATOR),true) # relevant headers and 32-bit libraries for audio (The host 64-bit Lucid # doesn't provide these anymore, only their 64-bit versions). ifeq ($(HOST_OS),linux) - HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux + ifneq ($(wildcard prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux),) + HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3/bin/i686-linux + else + HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux + endif # Don't do anything if the toolchain is not there ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc))) MY_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc 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" |