commit feec98b139d2ca0b0164a5e178e75ce88b8f492f
author Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
tree 5f3fabe21a06e92d94f179c4bed05de7d937b949
parent f760bcbae298d63a53c710cf8857de6174857e25
parent 62855a83b86c0b40583888f93d8b054c7d8ac99c

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07

core/llvm_config.mk

diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index bc90b95..4145028 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -41,12 +41,12 @@
 endif
 ifeq ($(TARGET_ARCH),x86)
   CLANG_CONFIG_EXTRA_CFLAGS += \
-    -target i686-android-linux \
+    -target i686-linux-android \
     -nostdlibinc \
-    -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin
+    -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
   CLANG_CONFIG_EXTRA_LDFLAGS += \
-    -target i686-android-linux \
-    -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin
+    -target i686-linux-android \
+    -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
   CLANG_CONFIG_UNKNOWN_CFLAGS += \
     -finline-limit=300 \
     -fno-inline-functions-called-once \