Merge pull request #11965 from anntzer/wstrict-proto

QuLogic · web-flow · commit fb0035fd62d5 · 2018-08-28T20:45:09.000-04:00
Move the removal of the -Wstrict-prototypes flag to setup.py.
diff --git a/setup.py b/setup.py
@@ -108,9 +108,13 @@ def __init__(self, dist):
 
 class BuildExtraLibraries(BuildExtCommand):
     def run(self):
+        # Remove the -Wstrict-prototypes option, it's not valid for C++.
+        try:
+            self.compiler.compiler_so.remove('-Wstrict-prototypes')
+        except (ValueError, AttributeError):
+            pass
         for package in good_packages:
             package.do_custom_build()
-
         return BuildExtCommand.run(self)
 
 
diff --git a/setupext.py b/setupext.py
@@ -202,21 +202,6 @@ def print_line(*args, **kwargs):
     print_status = print_message = print_raw = print_line
 
 
-# Remove the -Wstrict-prototypes option, is it's not valid for C++
-customize_compiler = distutils.command.build_ext.customize_compiler
-
-
-def my_customize_compiler(compiler):
-    retval = customize_compiler(compiler)
-    try:
-        compiler.compiler_so.remove('-Wstrict-prototypes')
-    except (ValueError, AttributeError):
-        pass
-    return retval
-
-distutils.command.build_ext.customize_compiler = my_customize_compiler
-
-
 def make_extension(name, files, *args, **kwargs):
     """
     Make a new extension.  Automatically sets include_dirs and
