]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-40656: Clean up detect_socket() (GH-20148)
authorErlend Egeberg Aasland <erlend.aasland@innova.no>
Wed, 18 Nov 2020 00:08:58 +0000 (01:08 +0100)
committerGitHub <noreply@github.com>
Wed, 18 Nov 2020 00:08:58 +0000 (19:08 -0500)
setup.py

index 91358af9b616b2bfc41462a4d99122125256bba0..6546544a99d0d96d515e2c26c4f0f416ebc09930 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1154,18 +1154,16 @@ class PyBuildExt(build_ext):
 
     def detect_socket(self):
         # socket(2)
-        if not VXWORKS:
-            kwargs = {'depends': ['socketmodule.h']}
-            if MACOS:
-                # Issue #35569: Expose RFC 3542 socket options.
-                kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']
-
-            self.add(Extension('_socket', ['socketmodule.c'], **kwargs))
-        elif self.compiler.find_library_file(self.lib_dirs, 'net'):
-            libs = ['net']
-            self.add(Extension('_socket', ['socketmodule.c'],
-                               depends=['socketmodule.h'],
-                               libraries=libs))
+        kwargs = {'depends': ['socketmodule.h']}
+        if VXWORKS:
+            if not self.compiler.find_library_file(self.lib_dirs, 'net'):
+                return
+            kwargs['libraries'] = ['net']
+        elif MACOS:
+            # Issue #35569: Expose RFC 3542 socket options.
+            kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']
+
+        self.add(Extension('_socket', ['socketmodule.c'], **kwargs))
 
     def detect_dbm_gdbm(self):
         # Modules that provide persistent dictionary-like semantics.  You will