diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-03 21:47:04 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-03 21:47:04 -0800 |
| commit | d666bb100965c1465eec5e03af30a30d33fafebe (patch) | |
| tree | 15ad8bd7aa102ac13cb9ad0050c21b30a93b4dcb /core/cxx_stl_setup.mk | |
| parent | edab98a40a0954789c21eaf6c122c99be2ce2d99 (diff) | |
| download | build-d666bb100965c1465eec5e03af30a30d33fafebe.zip build-d666bb100965c1465eec5e03af30a30d33fafebe.tar.gz build-d666bb100965c1465eec5e03af30a30d33fafebe.tar.bz2 | |
Fix the mac build.
Bug: 19567451
Change-Id: I6d15259520c9813df1a44d9244c99482f713d114
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 3461f03..265d8cb 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -27,8 +27,10 @@ else 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 +HOST_linux_dynamic_gcclibs := -lgcc_s -lgcc -lc -lgcc_s -lgcc +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 ifdef LOCAL_IS_HOST_MODULE @@ -57,7 +59,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_cppflags += -nostdinc++ my_ldflags += -nodefaultlibs my_ldlibs += -lpthread -lm - my_ldlibs += $($(my_prefix)$(my_link_type)_gcclibs) + my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs) endif else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),) ifndef LOCAL_IS_HOST_MODULE @@ -86,7 +88,7 @@ else ifeq ($(my_cxx_stl),none) ifdef LOCAL_IS_HOST_MODULE my_cppflags += -nostdinc++ my_ldflags += -nodefaultlibs - my_ldlibs += $($(my_prefix)$(my_link_type)_gcclibs) + my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs) endif else $(error $(my_cxx_stl) is not a supported STL.) |