commit cd5d0422ac07b03220970a3606f8b402a3636528
author Ian Rogers <irogers@google.com> Fri May 17 15:54:01 2013 -0700
committer Ian Rogers <irogers@google.com> Fri May 17 15:54:01 2013 -0700
tree 6879c685081ce4e4f53eb33bb2a8ad60d55cdc9b
parent e606010a5e5ea803736576b47740a2551e5d0dfc

Clang build support, -Wthread-safety with GCC 4.6.

Change-Id: Idccb4daa012c66a6ece3f7a037c9c2c029beba64

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index b30e27b..ee968a7 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -62,6 +62,7 @@
 
   LOCAL_CFLAGS := $(ART_EXECUTABLES_CFLAGS)
   ifeq ($$(art_target_or_host),target)
+    LOCAL_CLANG := $(ART_TARGET_CLANG)
     LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)
     ifeq ($$(art_ndebug_or_debug),debug)
       LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
@@ -69,6 +70,7 @@
       LOCAL_CFLAGS += $(ART_TARGET_NON_DEBUG_CFLAGS)
     endif
   else # host
+    LOCAL_CLANG := $(ART_HOST_CLANG)
     LOCAL_CFLAGS += $(ART_HOST_CFLAGS)
     ifeq ($$(art_ndebug_or_debug),debug)
       LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)