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

Merge "Cleanup libc++ configuration."

Browse Source
This commit is contained in:
Dan Albert
2015-05-06 19:51:05 +00:00
committed by Gerrit Code Review
parent b2ce04b431 0ad5bd22c8
commit 955ebbaa95
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/cxx_stl_setup.mk
View File

@@ -49,15 +49,11 @@ endif
ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_cflags += -D_USING_LIBCXX my_cflags += -D_USING_LIBCXX
my_c_includes += external/libcxx/include my_c_includes += external/libcxx/include
ifeq ($(my_cxx_stl),libc++)
ifeq ($(my_link_type),dynamic)
my_shared_libraries += libc++ my_shared_libraries += libc++
else else
my_static_libraries += libc++_static my_static_libraries += libc++_static
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_static_libraries += libm libc libdl
endif
endif
endif endif
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
@@ -71,7 +67,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
endif endif
ifeq ($(my_link_type),static) ifeq ($(my_link_type),static)
my_static_libraries += libdl my_static_libraries += libm libc libdl
else else
my_shared_libraries += libdl my_shared_libraries += libdl
endif endif