tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Map cpp_std c++17/gnu++17 to 1z."

Browse source
This commit is contained in:
Treehugger Robot 2017-07-27 00:20:16 +00:00 committed by Gerrit Code Review
commit 9ccbabc1ea
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cc/compiler.go
View file

@ -365,11 +365,15 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
cStd = compiler.Properties.C_std
}
cppStd := config.CppStdVersion
if compiler.Properties.Cpp_std == "experimental" {
cppStd := compiler.Properties.Cpp_std
switch compiler.Properties.Cpp_std {
case "":
cppStd = config.CppStdVersion
case "experimental":
cppStd = config.ExperimentalCppStdVersion
} else if compiler.Properties.Cpp_std != "" {
cppStd = compiler.Properties.Cpp_std
case "c++17", "gnu++17":
// Map c++17 and gnu++17 to their 1z equivalents, until 17 is finalized.
cppStd = strings.Replace(compiler.Properties.Cpp_std, "17", "1z", 1)
}
if !flags.Clang {