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

am ccf1cc55: Merge "Fix the mac build."

Browse Source 
* commit 'ccf1cc55a4448dc43302624da07d3211356473e2':
  Fix the mac build.
This commit is contained in:
Dan Albert
2015-03-04 06:23:10 +00:00
committed by Android Git Automerger
parent 850e0b3aff ccf1cc55a4
commit a10263ed1f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/cxx_stl_setup.mk
View File

@@ -27,8 +27,10 @@ else
endif endif
# Yes, this is actually what the clang driver does. # Yes, this is actually what the clang driver does.
HOST_dynamic_gcclibs := -lgcc_s -lgcc -lc -lgcc_s -lgcc HOST_linux_dynamic_gcclibs := -lgcc_s -lgcc -lc -lgcc_s -lgcc
HOST_static_gcclibs := -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group HOST_linux_static_gcclibs := -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
HOST_darwin_dynamic_gcclibs := -lc -lSystem
HOST_darwin_static_gcclibs := NO_STATIC_HOST_BINARIES_ON_DARWIN
my_link_type := dynamic my_link_type := dynamic
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
@@ -57,7 +59,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_cppflags += -nostdinc++ my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs my_ldflags += -nodefaultlibs
my_ldlibs += -lpthread -lm my_ldlibs += -lpthread -lm
my_ldlibs += $($(my_prefix)$(my_link_type)_gcclibs) my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs)
endif endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),) else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
@@ -86,7 +88,7 @@ else ifeq ($(my_cxx_stl),none)
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
my_cppflags += -nostdinc++ my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs my_ldflags += -nodefaultlibs
my_ldlibs += $($(my_prefix)$(my_link_type)_gcclibs) my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs)
endif endif
else else
$(error $(my_cxx_stl) is not a supported STL.) $(error $(my_cxx_stl) is not a supported STL.)