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

Merge "Stop mapping c++17 to c++1z." am: 60045811c0

Browse Source 
am: 49801f4373

Change-Id: Idc29b66b27e5c9bb09d2f3ad159f8e4991a9128f
This commit is contained in:
Peter Collingbourne
2018-12-05 18:24:46 -08:00
committed by android-build-merger
parent 526c8bb63d 49801f4373
commit 7731129d55
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/compiler.go
View File

@@ -414,9 +414,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
cppStd = config.CppStdVersion
case "experimental":
cppStd = config.ExperimentalCppStdVersion
case "c++17", "gnu++17":
// Map c++17 and gnu++17 to their 1z equivalents, until 17 is finalized.
cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1)
}
if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false {