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

Cleanup libc++ configuration.

Browse Source 
Change-Id: I2162f2a19c7f13cfbd4a2530a783a4e671d7cdb1
This commit is contained in:
Dan Albert
2015-05-06 10:08:11 -07:00
parent b2ce04b431
commit 0ad5bd22c8
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),)
my_cflags += -D_USING_LIBCXX
my_c_includes += external/libcxx/include
ifeq ($(my_cxx_stl),libc++)
ifeq ($(my_link_type),dynamic)
my_shared_libraries += libc++
else
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
ifdef LOCAL_IS_HOST_MODULE
@@ -71,7 +67,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
endif
ifeq ($(my_link_type),static)
my_static_libraries += libdl
my_static_libraries += libm libc libdl
else
my_shared_libraries += libdl
endif