Only define __APPLE_USE_RFC_3542 when building socket lib

Erlend E. Aasland · Erlend E. Aasland · commit f6bda5d49fef · 2020-04-27T12:27:46.000+02:00
diff --git a/configure b/configure
@@ -7421,9 +7421,6 @@ $as_echo "$ac_cv_enable_visibility" >&6; }
 	    ;;
 
     Darwin*)
-        # Issue #35569: Expose the RFC 3542 socket options.
-        CFLAGS="-D__APPLE_USE_RFC_3542 ${CFLAGS}"
-
         # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
         # used to be here, but non-Apple gcc doesn't accept them.
         if test "${CC}" = gcc
diff --git a/configure.ac b/configure.ac
@@ -1844,9 +1844,6 @@ yes)
 	    ;;
 
     Darwin*)
-        # Issue #35569: Expose the RFC 3542 socket options.
-        CFLAGS="-D__APPLE_USE_RFC_3542 ${CFLAGS}"
-
         # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
         # used to be here, but non-Apple gcc doesn't accept them.
         if test "${CC}" = gcc
diff --git a/setup.py b/setup.py
@@ -1094,8 +1094,12 @@ def detect_crypt(self):
     def detect_socket(self):
         # socket(2)
         if not VXWORKS:
-            self.add(Extension('_socket', ['socketmodule.c'],
-                               depends=['socketmodule.h']))
+            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'],
