commit b0ef9111ac3ffafa31c1dbd379c92dc349d1e571
author Colin Cross <ccross@android.com> Tue Feb 11 12:47:52 2014 -0800
committer Colin Cross <ccross@android.com> Tue Feb 11 12:48:12 2014 -0800
tree 5bf907be33c0866a0236e3c526497eb960199f62
parent 145562fcef979e4fea946987717618dba6148aeb

fix 2nd target clang prebuilt paths

Change-Id: I4c196221bd377e30bbff1aafa265952e29c85cb5

core/clang/TARGET_arm.mk

diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk
index 373f276..f32bbfb 100644
--- a/core/clang/TARGET_arm.mk
+++ b/core/clang/TARGET_arm.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi
 CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin
 
 CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_mips.mk

diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk
index 215a8ae..e70e254 100644
--- a/core/clang/TARGET_mips.mk
+++ b/core/clang/TARGET_mips.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android
 CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin
 
 CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_x86.mk

diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk
index 0178093..0f530b5 100644
--- a/core/clang/TARGET_x86.mk
+++ b/core/clang/TARGET_x86.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android
 CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
 
 CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \