commit d318ba66f90272b618e035e996e0a04f02b4481d
author Tim Murray <timmurray@google.com> Mon Apr 21 14:00:31 2014 -0700
committer Tim Murray <timmurray@google.com> Tue Apr 22 09:26:22 2014 -0700
tree 35da08db7310b17dc2b8161dab126684b71f5be0
parent 488b23d96dc796e457d8df4d7775cefcf68320af

Update build system for better Clang behavior on Mac.

Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index c471f7e..6bc5f28 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -33,10 +33,10 @@
   -Wno-unused-but-set-parameter
 
 # Clang flags for all host rules
-CLANG_CONFIG_HOST_EXTRA_ASFLAGS := --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG)
-CLANG_CONFIG_HOST_EXTRA_CFLAGS := --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG)
-CLANG_CONFIG_HOST_EXTRA_CPPFLAGS := --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG)
-CLANG_CONFIG_HOST_EXTRA_LDFLAGS := --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG)
+CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=
+CLANG_CONFIG_HOST_EXTRA_CFLAGS :=
+CLANG_CONFIG_HOST_EXTRA_CPPFLAGS :=
+CLANG_CONFIG_HOST_EXTRA_LDFLAGS :=
 
 # Clang flags for all target rules
 CLANG_CONFIG_TARGET_EXTRA_ASFLAGS :=

core/clang/x86_common.mk

diff --git a/core/clang/x86_common.mk b/core/clang/x86_common.mk
index d75d83f..bce95cb 100644
--- a/core/clang/x86_common.mk
+++ b/core/clang/x86_common.mk
@@ -13,17 +13,21 @@
 endif
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
+  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
   --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot
 
-CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS :=
+CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
+  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \
+  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
   --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG) \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/backward \
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
+  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
   --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/bin \
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/4.6.x-google \