StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent 27b188bc86 f5720175dd
commit 9ccbabc1ea
1 changed files with 8 additions and 4 deletions
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 cStd = compiler.Properties.C_std
} }
cppStd := config.CppStdVersion cppStd := compiler.Properties.Cpp_std
if compiler.Properties.Cpp_std == "experimental" { switch compiler.Properties.Cpp_std {
case "":
cppStd = config.CppStdVersion
case "experimental":
cppStd = config.ExperimentalCppStdVersion cppStd = config.ExperimentalCppStdVersion
} else if compiler.Properties.Cpp_std != "" { case "c++17", "gnu++17":
cppStd = compiler.Properties.Cpp_std // 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 { if !flags.Clang {