aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-01-26 13:33:35 -0800
committerDan Albert <danalbert@google.com>2016-01-26 13:53:13 -0800
commit41c36c9687138a40076a7cd283b2d549c744d111 (patch)
tree4664b85f216449ed692fdecf7353ce37020fdeab
parente24ca048efad3c1e4d6e8af7b37576600e0c29c6 (diff)
downloadndk-41c36c9687138a40076a7cd283b2d549c744d111.tar.gz
Remove some legacy makefile cruft.
Change-Id: I1d9163882008a252760fe5608b635acc7efd93e7
-rw-r--r--sources/cxx-stl/llvm-libc++/Android.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/sources/cxx-stl/llvm-libc++/Android.mk b/sources/cxx-stl/llvm-libc++/Android.mk
index 8ebbb1324..20618c090 100644
--- a/sources/cxx-stl/llvm-libc++/Android.mk
+++ b/sources/cxx-stl/llvm-libc++/Android.mk
@@ -89,12 +89,6 @@ llvm_libc++_includes += $(libcxxabi_c_includes)
llvm_libc++_export_includes += $(libcxxabi_c_includes)
llvm_libc++_cflags += -D__STDC_FORMAT_MACROS
-ifeq (clang3.5,$(NDK_TOOLCHAIN_VERSION))
-# Workaround an issue of integrated-as (default in clang3.5) where it fails to compile
-# llvm-libc++abi/libcxxabi/src/Unwind/UnwindRegistersRestore.S
-llvm_libc++_cflags += -no-integrated-as
-endif
-
ifneq ($(LIBCXX_FORCE_REBUILD),true)
$(call ndk_log,Using prebuilt libc++ libraries)