[Python-checkins] r75281 - python/trunk/setup.py

ronald.oussoren python-checkins at python.org
Thu Oct 8 10:04:16 CEST 2009


Author: ronald.oussoren
Date: Thu Oct  8 10:04:15 2009
New Revision: 75281

Log:
Ensure that _scproxy gets build even when --disable-toolbox-glue
is specified on OSX. Fixes a regression in 2.6.3.


Modified:
   python/trunk/setup.py

Modified: python/trunk/setup.py
==============================================================================
--- python/trunk/setup.py	(original)
+++ python/trunk/setup.py	Thu Oct  8 10:04:15 2009
@@ -1347,6 +1347,15 @@
         else:
             missing.append('sunaudiodev')
 
+        if platform == 'darwin':
+            # _scproxy
+            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
+                extra_link_args= [
+                    '-framework', 'SystemConfiguration',
+                    '-framework', 'CoreFoundation'
+                ]))
+
+
         if platform == 'darwin' and ("--disable-toolbox-glue" not in
                 sysconfig.get_config_var("CONFIG_ARGS")):
 
@@ -1400,15 +1409,6 @@
             addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
             addMacExtension('autoGIL', core_kwds)
 
-            # _scproxy
-            sc_kwds = {
-                'extra_compile_args': carbon_extra_compile_args,
-                'extra_link_args': [
-                    '-framework', 'SystemConfiguration',
-                    '-framework', 'CoreFoundation'
-                ],
-            }
-            addMacExtension("_scproxy", sc_kwds)
 
 
             # Carbon


More information about the Python-checkins mailing list