commit fc502108113665ec61956590850b756bd5583cca
author Elliott Hughes <enh@google.com> Tue May 22 23:05:35 2012 -0700
committer Elliott Hughes <enh@google.com> Tue May 22 23:05:35 2012 -0700
tree 1c47c9cc54f3cae44bad1c094d3f8eef50c3eba9
parent f819152dfcff11daabe514eacc708c54b71174c7

More Mac build hackery.

Change-Id: I4d11ff8b46d762ad6d19ef31f42111933610ed6b

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 6f1119a..08ee5e3 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -86,6 +86,8 @@
 ifneq ($(HOST_OS),linux)
   # Some Mac OS pthread header files are broken with -fkeep-inline-functions.
   ART_HOST_DEBUG_CFLAGS := $(filter-out -fkeep-inline-functions,$(ART_HOST_DEBUG_CFLAGS))
+  # Mac OS doesn't have libsupc++.
+  ART_HOST_DEBUG_LDLIBS := $(filter-out -lsupc++,$(ART_HOST_DEBUG_LDLIBS))
 endif
 
 ART_TARGET_DEBUG_CFLAGS := $(art_debug_cflags)

build/Android.libart.mk

diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index 0597f84..4b882b6 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -95,17 +95,18 @@
     LOCAL_STATIC_LIBRARIES += librsloader libLLVMSupport
   endif
   LOCAL_SHARED_LIBRARIES := liblog libnativehelper
-  ifneq ($(HOST_OS),darwin)
-    LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
-  endif
   ifeq ($$(art_target_or_host),target)
     LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl
     LOCAL_SHARED_LIBRARIES += libdynamic_annotations # tsan support
+    LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
   else # host
     LOCAL_STATIC_LIBRARIES += libcutils
     LOCAL_SHARED_LIBRARIES += libz-host
     LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host # tsan support
     LOCAL_LDLIBS += -ldl -lpthread
+    ifneq ($(HOST_OS),darwin)
+      LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
+    endif
     ifeq ($(HOST_OS),linux)
       LOCAL_LDLIBS += -lrt
     endif