Removed -Wextra from default CFLAGS. Many repos don't compile clean w…

…ith it so seems better to have that opt-in.
thought-machine · Jan 15, 2017 · d653f09 · d653f09
1 parent 1ca7007
commit d653f09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/docs/config.html b/docs/config.html
@@ -402,21 +402,21 @@ <h3><a name="cpp">[Cpp]</a></h3>
         Compiler flags passed to all C rules during <code>opt</code> builds;
 	these are typically pretty basic things like
         what language standard you want to target, warning flags, etc.<br/>
-        Defaults to <code>--std=c99 -O3 -DNDEBUG -Wall -Wextra -Werror</code></li>
+        Defaults to <code>--std=c99 -O3 -DNDEBUG -Wall -Werror</code></li>
 
       <li><b>DefaultDbgCflags</b><br/>
         Compiler rules passed to all C rules during <code>dbg</code> builds.<br/>
-        Defaults to <code>--std=c99 -g3 -DDEBUG -Wall -Wextra -Werror</code>.</li>
+        Defaults to <code>--std=c99 -g3 -DDEBUG -Wall -Werror</code>.</li>
 
       <li><b>DefaultOptCppflags</b><br/>
         Compiler flags passed to all C++ rules during <code>opt</code> builds;
 	these are typically pretty basic things like
         what language standard you want to target, warning flags, etc.<br/>
-        Defaults to <code>--std=c++11 -O3 -DNDEBUG -Wall -Wextra -Werror</code></li>
+        Defaults to <code>--std=c++11 -O3 -DNDEBUG -Wall -Werror</code></li>
 
       <li><b>DefaultDbgCppflags</b><br/>
         Compiler rules passed to all C++ rules during <code>dbg</code> builds.<br/>
-        Defaults to <code>--std=c++11 -g3 -DDEBUG -Wall -Wextra -Werror</code>.</li>
+        Defaults to <code>--std=c++11 -g3 -DDEBUG -Wall -Werror</code>.</li>
 
       <li><b>DefaultLdFlags</b><br/>
         Linker flags passed to all C++ rules.<br/>

diff --git a/src/core/config.go b/src/core/config.go
@@ -144,10 +144,10 @@ func DefaultConfiguration() *Configuration {
 	config.Cpp.LdTool = "ld"
 	config.Cpp.ArTool = "ar"
 	config.Cpp.AsmTool = "nasm"
-	config.Cpp.DefaultOptCflags = "--std=c99 -O3 -pipe -DNDEBUG -Wall -Wextra -Werror"
-	config.Cpp.DefaultDbgCflags = "--std=c99 -g3 -pipe -DDEBUG -Wall -Wextra -Werror"
-	config.Cpp.DefaultOptCppflags = "--std=c++11 -O3 -pipe -DNDEBUG -Wall -Wextra -Werror"
-	config.Cpp.DefaultDbgCppflags = "--std=c++11 -g3 -pipe -DDEBUG -Wall -Wextra -Werror"
+	config.Cpp.DefaultOptCflags = "--std=c99 -O3 -pipe -DNDEBUG -Wall -Werror"
+	config.Cpp.DefaultDbgCflags = "--std=c99 -g3 -pipe -DDEBUG -Wall -Werror"
+	config.Cpp.DefaultOptCppflags = "--std=c++11 -O3 -pipe -DNDEBUG -Wall -Werror"
+	config.Cpp.DefaultDbgCppflags = "--std=c++11 -g3 -pipe -DDEBUG -Wall -Werror"
 	config.Cpp.Coverage = true
 	config.Proto.ProtocTool = "protoc"
 	// We're using the most common names for these; typically gRPC installs the builtin plugins