Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4a27b2 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Only set -Wall once. 

We set -Wall in the global cflags, and then again at the point where we
decide whether or not to add -Werror. The trouble with this is that it
undoes the effect of any attempt to disable a warning implied by -Wall.

Discovered while trying to enable -Wmisleading-indentation (which is
part of -Wall) in a way that doesn't apply to external/ or vendor/.

Test: treehugger
Change-Id: I68d74fb05922dd9f6bd4c8423ca69b485c15e3d2
parent 75834815

cc/cc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -4041,7 +4041,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) { 
	conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}

	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"}

	cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}

cc/compiler.go

+1 −2
Original line number Diff line number Diff line
@@ -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) {

			if warningsAreAllowed(ctx.ModuleDir()) {

				addToModuleList(ctx, modulesAddedWallKey, module)

				flags.Local.CFlags = append([]string{"-Wall"}, flags.Local.CFlags...)

			} else {

				flags.Local.CFlags = append([]string{"-Wall", "-Werror"}, flags.Local.CFlags...)

				flags.Local.CFlags = append([]string{"-Werror"}, flags.Local.CFlags...)

			}

		}

	}