commit 47f42341e1b7a01c2b4fb461f5ab7e603fd0d685
author Andrew Hsieh <andrewhsieh@google.com> Wed Nov 21 19:05:29 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 21 19:05:30 2012 -0800
tree ff3860b592961142f40f7548d9735cc792f62770
parent 4c38a7c6f4c3228c0a36fa4cd4763c9a39f110cd
parent 7ce5359bc86d6d9a221da723c2437c36b6ee474b

Merge "Fix clang 3.1 under cygwin environment."

toolchains/arm-linux-androideabi-clang3.1/setup.mk

diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
index 188840e..482d8f8 100644
--- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk
+++ b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
@@ -47,8 +47,7 @@
 #
 
 TARGET_CFLAGS := \
-    -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT) \
-    -isystem $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/lib/clang/$(LLVM_VERSION)/include \
+    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -fpic \
     -ffunction-sections \
     -funwind-tables \
@@ -57,7 +56,7 @@
     -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
 
 TARGET_LDFLAGS := \
-    -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT)
+    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT))
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include

toolchains/mipsel-linux-android-clang3.1/setup.mk

diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk
index 4879d3f..5922a80 100644
--- a/toolchains/mipsel-linux-android-clang3.1/setup.mk
+++ b/toolchains/mipsel-linux-android-clang3.1/setup.mk
@@ -49,7 +49,7 @@
 LLVM_TRIPLE := mipsel-none-linux-android
 
 TARGET_CFLAGS := \
-        -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT) \
+        -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
         -target $(LLVM_TRIPLE) \
         -fpic \
         -fno-strict-aliasing \
@@ -59,7 +59,7 @@
         -fmessage-length=0
 
 TARGET_LDFLAGS := \
-        -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT) \
+        -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
         -target $(LLVM_TRIPLE)
 
 TARGET_C_INCLUDES := \

toolchains/x86-clang3.1/setup.mk

diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk
index 58e2085..602af5f 100644
--- a/toolchains/x86-clang3.1/setup.mk
+++ b/toolchains/x86-clang3.1/setup.mk
@@ -45,7 +45,7 @@
 LLVM_TRIPLE := i686-none-linux-android
 
 TARGET_CFLAGS := \
-    -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT) \
+    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -target $(LLVM_TRIPLE) \
     -ffunction-sections \
     -funwind-tables \
@@ -57,7 +57,7 @@
 
 # Add and LDFLAGS for the target here
 TARGET_LDFLAGS := \
-    -gcc-toolchain $(TOOLCHAIN_PREBUILT_ROOT) \
+    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -target $(LLVM_TRIPLE)
 
 TARGET_x86_release_CFLAGS :=  -O2 \