diff options
author | Dan Albert <danalbert@google.com> | 2015-10-26 21:05:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-26 21:05:39 +0000 |
commit | dba46710fe5bb0ea3bea8c3c0fea76273d343ff3 (patch) | |
tree | 4272aeb244045d00bd50844c827115e58277dc12 | |
parent | 14c2d968b913573e7a21fe72723254c9cc277210 (diff) | |
parent | da637397679a03fef665ccefa4c1b7f6c2473fb3 (diff) | |
download | build-dba46710fe5bb0ea3bea8c3c0fea76273d343ff3.tar.gz |
Merge "Drop GCC back to C++11."
-rw-r--r-- | core/binary.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk index 28aa882dc2..e9b22656fc 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -203,6 +203,14 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true) endif my_cpp_std_version := -std=gnu++14 + +ifneq ($(my_clang),true) + # GCC uses an invalid C++14 ABI (emits calls to + # __cxa_throw_bad_array_length, which is not a valid C++ RT ABI). + # http://b/25022512 + my_cpp_std_version := -std=gnu++11 +endif + ifdef LOCAL_SDK_VERSION # The NDK handles this itself. my_cpp_std_version := |