StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d0ae4796: Merge "Blacklist libc++ from windows host builds"

Browse Source 
* commit 'd0ae4796a10b9855a738c5f5c79e603cac30cb9f':
  Blacklist libc++ from windows host builds
This commit is contained in:
Dan Willemsen
2015-09-01 16:37:42 +00:00
committed by Android Git Automerger
parent 7086e1136a d0ae4796a1
commit 883897ec16
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/cxx_stl_setup.mk
View File

@@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default)
my_cxx_stl := libc++_static my_cxx_stl := libc++_static
endif endif
ifdef USE_MINGW ifeq ($($(my_prefix)OS),windows)
# libc++ is not supported on mingw. # libc++ is not supported on mingw.
my_cxx_stl := libstdc++ my_cxx_stl := libstdc++
endif endif
@@ -36,6 +36,14 @@ else
# the two options use different names for the STLs. # 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) $(error $(LOCAL_PATH): $(LOCAL_MODULE): Must use LOCAL_NDK_STL_VARIANT rather than LOCAL_CXX_STL for NDK binaries)
endif 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 endif
# Yes, this is actually what the clang driver does. # Yes, this is actually what the clang driver does.