openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "GccCppStdVersion should not be needed anymore"

This commit is contained in:
Treehugger Robot 2018-09-26 20:19:01 +00:00 committed by Gerrit Code Review
parent 60b0360c3b 43cfe82174
commit e12f5e23c2
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cc/compiler.go
View File

@ -444,16 +444,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1) 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 { if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false {
cStd = gnuToCReplacer.Replace(cStd) cStd = gnuToCReplacer.Replace(cStd)
cppStd = gnuToCReplacer.Replace(cppStd) cppStd = gnuToCReplacer.Replace(cppStd)

1
cc/config/global.go
View File

@ -119,7 +119,6 @@ var (
CStdVersion = "gnu99" CStdVersion = "gnu99"
CppStdVersion = "gnu++14" CppStdVersion = "gnu++14"
GccCppStdVersion = "gnu++11"
ExperimentalCStdVersion = "gnu11" ExperimentalCStdVersion = "gnu11"
ExperimentalCppStdVersion = "gnu++1z" ExperimentalCppStdVersion = "gnu++1z"