commit 62304f1ec3557be82f3ec1be51e2a870d59022dc
author Stephen Hines <srhines@google.com> Thu Mar 22 21:26:17 2012 -0700
committer Stephen Hines <srhines@google.com> Thu Mar 22 21:26:17 2012 -0700
tree b3937fd09071dc98c551254ba971a71f93fdfd3c
parent d6bfbb652f3e99c0f533f34f15f12e0770880556

Make sure compiler flags also pick up correct toolchain.

Change-Id: Id6ff8c3ee7cfa5dee46ef000cbceb7666b934240

core/llvm_config.mk

diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index 103221c..ec6720a 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -22,6 +22,7 @@
 ifeq ($(TARGET_ARCH),arm)
   CLANG_CONFIG_EXTRA_CFLAGS += \
     -target arm-linux-androideabi \
+    -B$(TARGET_TOOLCHAIN_ROOT)/arm-linux-androideabi/bin \
     -mllvm -arm-enable-ehabi
   CLANG_CONFIG_EXTRA_LDFLAGS += \
     -target arm-linux-androideabi \
@@ -35,7 +36,8 @@
 endif
 ifeq ($(TARGET_ARCH),x86)
   CLANG_CONFIG_EXTRA_CFLAGS += \
-    -target i686-android-linux
+    -target i686-android-linux \
+    -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin
   CLANG_CONFIG_EXTRA_LDFLAGS += \
     -target i686-android-linux \
     -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin