X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=f9aa784397dae9599ae64e7c017ddc3cb652c87a;hb=47245166de02206389a0cb18aae7de35f8517c7d;hp=f958b49fa003912255e95b6d9f35d4d55a615ccf;hpb=10637d3694aac941c022081166c4956a5d0b28f1;p=dcpomatic.git

diff --git a/wscript b/wscript
index f958b49fa..f9aa78439 100644
--- a/wscript
+++ b/wscript
@@ -122,12 +122,9 @@ 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
+        # Most gccs still give these warnings from boost::optional
+        conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
     else:
         have_c11 = False