Use -Werror only when --maintainer-mode is set as warnings will sneak

in on platforms/configs I don't test regularly, and that shouldn't
break end-user builds.

2 files changed, 9 insertions, 6 deletions

diff --git a/configure.py b/configure.py
index 588c33159..03701dec9 100755
--- a/configure.py
+++ b/configure.py
@@ -230,7 +230,8 @@ def process_command_line(args):
                             help='set the name of the compiler binary')
 
     target_group.add_option('--cc-abi-flags', metavar='FLAG',
-                            help='set compiler ABI flags')
+                            help='set compiler ABI flags',
+                            default='')
 
     target_group.add_option('--chost', help=optparse.SUPPRESS_HELP)
 
@@ -1082,9 +1083,10 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
     def warning_flags(normal_flags,
                       maintainer_flags,
                       maintainer_mode):
-        if maintainer_mode and maintainer_flags != '':
-            return maintainer_flags
-        return normal_flags
+        if maintainer_mode:
+            return maintainer_flags + normal_flags
+        else:
+            return normal_flags
 
     def innosetup_arch(os, arch):
         if os != 'windows':
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index ed425ca84..b8b9b15b3 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -8,8 +8,9 @@ add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-lang_flags "-D_REENTRANT -std=c++11"
-warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
+lang_flags "-std=c++11 -D_REENTRANT -fstack-protector"
+maintainer_warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant"
+warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
 
 lib_opt_flags "-O3"
 check_opt_flags "-O2"