am d0ae4796: Merge "Blacklist libc++ from windows host builds"
* commit 'd0ae4796a10b9855a738c5f5c79e603cac30cb9f':
Blacklist libc++ from windows host builds
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index f150714..cda45a0 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -14,7 +14,7 @@
my_cxx_stl := libc++_static
endif
- ifdef USE_MINGW
+ ifeq ($($(my_prefix)OS),windows)
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
endif
@@ -36,6 +36,14 @@
# the two options use different names for the STLs.
$(error $(LOCAL_PATH): $(LOCAL_MODULE): Must use LOCAL_NDK_STL_VARIANT rather than LOCAL_CXX_STL for NDK binaries)
endif
+ ifdef LOCAL_IS_HOST_MODULE
+ ifeq ($($(my_prefix)OS),windows)
+ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
+ # libc++ is not supported on mingw.
+ my_cxx_stl := libstdc++
+ endif
+ endif
+ endif
endif
# Yes, this is actually what the clang driver does.