Give up trying to be selective with -Wno-maybe-uninitialized

1 files changed, 2 insertions, 5 deletions

diff --git a/wscript b/wscript
index fdf743cdd..fbf115e1c 100644
--- a/wscript
+++ b/wscript
@@ -109,6 +109,8 @@ def configure(conf):
                                        '-Wwrite-strings',
                                        # I tried and failed to ignore these with _Pragma
                                        '-Wno-ignored-qualifiers',
+                                       # Most gccs still give these warnings from boost::optional
+                                       '-Wno-maybe-uninitialized',
                                        '-D_FILE_OFFSET_BITS=64'])
 
     if conf.options.force_cpp11:
@@ -122,11 +124,6 @@ def configure(conf):
         if int(gcc[0]) >= 8:
             # I tried and failed to ignore these with _Pragma
             conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
-        elif int(gcc[0]) >= 5 and int(gcc[0]) <= 8:
-            # There appears to be a GCC bug which lingered from major versions 5--8 and which
-            # flags up these warnings all over the place in boost::optional.
-            # This seems to be the only practical way to hide it.
-            conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
         have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
     else:
         have_c11 = False