StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop GCC back to C++11."

Browse Source 
am: dba46710fe

* commit 'dba46710fe5bb0ea3bea8c3c0fea76273d343ff3':
  Drop GCC back to C++11.
This commit is contained in:
Dan Albert
2015-10-26 21:10:15 +00:00
committed by android-build-merger
parent 52cc54dcee dba46710fe
commit a01ec70d92
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/binary.mk
View File

@@ -203,6 +203,14 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
endif endif
my_cpp_std_version := -std=gnu++14 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 ifdef LOCAL_SDK_VERSION
# The NDK handles this itself. # The NDK handles this itself.
my_cpp_std_version := my_cpp_std_version :=