aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
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 /Makefile.android
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 'Makefile.android')
-rw-r--r--Makefile.android6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.android b/Makefile.android
index e2dccb7..22d7438 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -95,11 +95,7 @@ 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)
- 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
+ HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
# 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