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

Merge "Only set -Wall once."

Browse Source
This commit is contained in:
Yi Kong
2022-05-19 07:43:08 +00:00
committed by Gerrit Code Review
parent 8212621410 ed4a27b2e1
commit 6769323a44
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc_test.go
View File

@@ -4041,7 +4041,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"} conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}
cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"} cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}
cflags := []string{"-Wall", "-Werror", "-std=candcpp"} cflags := []string{"-Werror", "-std=candcpp"}
cstd := []string{"-std=gnu11", "-std=conly"} cstd := []string{"-std=gnu11", "-std=conly"}
cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"} cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}

3
cc/compiler.go
View File

@@ -590,9 +590,8 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
} else if !inList("-Werror", flags.Local.CFlags) && !inList("-Werror", flags.Local.CppFlags) { } else if !inList("-Werror", flags.Local.CFlags) && !inList("-Werror", flags.Local.CppFlags) {
if warningsAreAllowed(ctx.ModuleDir()) { if warningsAreAllowed(ctx.ModuleDir()) {
addToModuleList(ctx, modulesAddedWallKey, module) addToModuleList(ctx, modulesAddedWallKey, module)
flags.Local.CFlags = append([]string{"-Wall"}, flags.Local.CFlags...)
} else { } else {
flags.Local.CFlags = append([]string{"-Wall", "-Werror"}, flags.Local.CFlags...) flags.Local.CFlags = append([]string{"-Werror"}, flags.Local.CFlags...)
} }
} }
} }