diff options
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index a2abb1a322..0d557c7d36 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -78,25 +78,11 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_static_libraries += libc++demangle ifeq ($(my_link_type),static) - my_static_libraries += libm libc - ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) - my_static_libraries += libunwind_llvm - my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a - else - my_static_libraries += libgcc_stripped - my_ldflags += -Wl,--exclude-libs,libgcc_stripped.a - endif + my_static_libraries += libm libc libunwind endif endif else ifeq ($(my_cxx_stl),ndk) - # Using an NDK STL. Handled in binary.mk, except for the unwinder. - ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) - my_static_libraries += libunwind_llvm - my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a - else - my_static_libraries += libgcc_stripped - my_ldflags += -Wl,--exclude-libs,libgcc_stripped.a - endif + # Using an NDK STL. Handled in binary.mk. else ifeq ($(my_cxx_stl),libstdc++) $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported) else ifeq ($(my_cxx_stl),none) |