diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-26 23:04:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-26 23:04:08 +0000 |
| commit | 9d68b3d2c4375909e42de85a6dad58e57703f211 (patch) | |
| tree | c17e64f1a4e982598a4b4963c516e95c481a30a2 | |
| parent | ac85966abcbef4eb50e9d78ba74fc8744b74eddc (diff) | |
| parent | 1788c0944db856e59ac40805cee4b7568dd7dbf6 (diff) | |
| download | ndk-9d68b3d2c4375909e42de85a6dad58e57703f211.tar.gz | |
Merge "Remove some legacy makefile cruft."
am: 1788c0944d
* commit '1788c0944db856e59ac40805cee4b7568dd7dbf6':
Remove some legacy makefile cruft.
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/Android.mk | 6 |
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 b291ca429..7c9f45880 100644 --- a/sources/cxx-stl/llvm-libc++/Android.mk +++ b/sources/cxx-stl/llvm-libc++/Android.mk @@ -94,12 +94,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) |