diff --git a/cc/compiler.go b/cc/compiler.go index f3cf04010..5ef9e4e8a 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -444,16 +444,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1) } - if !flags.Clang { - // 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 - // The host GCC doesn't support C++14 (and is deprecated, so likely - // never will). - // Build these modules with C++11. - cppStd = config.GccCppStdVersion - } - if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false { cStd = gnuToCReplacer.Replace(cStd) cppStd = gnuToCReplacer.Replace(cppStd) diff --git a/cc/config/global.go b/cc/config/global.go index 8b02f0271..000aab644 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -119,7 +119,6 @@ var ( CStdVersion = "gnu99" CppStdVersion = "gnu++14" - GccCppStdVersion = "gnu++11" ExperimentalCStdVersion = "gnu11" ExperimentalCppStdVersion = "gnu++1z"