| commit | dba46710fe5bb0ea3bea8c3c0fea76273d343ff3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 26 21:05:39 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 26 21:05:39 2015 +0000 |
| tree | 4272aeb244045d00bd50844c827115e58277dc12 | |
| parent | 14c2d968b913573e7a21fe72723254c9cc277210 [diff] | |
| parent | da637397679a03fef665ccefa4c1b7f6c2473fb3 [diff] |
Merge "Drop GCC back to C++11."
diff --git a/core/binary.mk b/core/binary.mk index 28aa882..e9b2265 100644 --- a/core/binary.mk +++ b/core/binary.mk
@@ -203,6 +203,14 @@ 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 :=