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

Merge "Select the correct target STL with USE_MINGW."

Browse Source
This commit is contained in:
Dan Albert
2015-05-05 21:40:01 +00:00
committed by Gerrit Code Review
parent 4824042356 88a8ce6946
commit b5ccb461ed
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/cxx_stl_setup.mk
View File

@@ -8,17 +8,17 @@
ifeq ($(strip $(LOCAL_CXX_STL)),default) ifeq ($(strip $(LOCAL_CXX_STL)),default)
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
# Platform code. Select the appropriate STL. # Platform code. Select the appropriate STL.
ifndef USE_MINGW
my_cxx_stl := libc++ my_cxx_stl := libc++
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
ifneq (,$(BUILD_HOST_static)) ifneq (,$(BUILD_HOST_static))
my_cxx_stl := libc++_static my_cxx_stl := libc++_static
endif endif
endif
else ifdef USE_MINGW
# libc++ is not supported on mingw. # libc++ is not supported on mingw.
my_cxx_stl := libstdc++ my_cxx_stl := libstdc++
endif endif
endif
else else
my_cxx_stl := ndk my_cxx_stl := ndk
endif endif