Various missing hunks.
These are hunks of changes that seem to have been lost between
ics-mr1-plus-art and dalvik-dev. Maybe bad merge resolutions?
Change-Id: I822c64651dc693df38efa8bc290edb959ce3398c
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 201d028..aeb4c79 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -102,6 +102,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)