aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.android')
-rw-r--r--Makefile.android6
1 files changed, 5 insertions, 1 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