tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d52afdd6: Merge "(Hopefully) fix the Mac build."

Browse source 
* commit 'd52afdd682b26ea6a13c066d6f037c9df6693489':
  (Hopefully) fix the Mac build.
This commit is contained in:
Dan Albert 2015-03-04 01:50:21 +00:00 committed by Android Git Automerger
commit 21b75e269e
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/cxx_stl_setup.mk
View file

@ -26,6 +26,10 @@ else
my_cxx_stl := $(strip $(LOCAL_CXX_STL))
endif
# Yes, this is actually what the clang driver does.
HOST_dynamic_gcclibs := -lgcc_s -lgcc -lc -lgcc_s -lgcc
HOST_static_gcclibs := -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_cflags += -D_USING_LIBCXX
my_c_includes += external/libcxx/include
@ -39,7 +43,11 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs
my_ldlibs += -lpthread -lm
my_ldlibs += -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
ifeq (,$(BUILD_HOST_static))
my_ldlibs += $(HOST_dynamic_gcclibs)
else
my_ldlibs += $(HOST_static_gcclibs)
endif
endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
ifndef LOCAL_IS_HOST_MODULE
@ -68,7 +76,11 @@ else ifeq ($(my_cxx_stl),none)
ifdef LOCAL_IS_HOST_MODULE
my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs
my_ldlibs += -lm -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
ifeq (,$(BUILD_HOST_static))
my_ldlibs += $(HOST_dynamic_gcclibs)
else
my_ldlibs += $(HOST_static_gcclibs)
endif
endif
else
$(error $(my_cxx_stl) is not a supported STL.)