summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-10-08 08:04:15 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-10-08 08:04:15 (GMT)
commita5b642c9332333f78876f8ae5ccde8d055fda5ea (patch)
tree0f1b93ed6cfe6e790b0d1d740435024b105b7c5c
parent15ae41c2db8b0779a7f584c238a8e9efe6e370b3 (diff)
downloadcpython-a5b642c9332333f78876f8ae5ccde8d055fda5ea.zip
cpython-a5b642c9332333f78876f8ae5ccde8d055fda5ea.tar.gz
cpython-a5b642c9332333f78876f8ae5ccde8d055fda5ea.tar.bz2
Ensure that _scproxy gets build even when --disable-toolbox-glue
is specified on OSX. Fixes a regression in 2.6.3.
-rw-r--r--setup.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/setup.py b/setup.py
index d229036..0a4dc52 100644
--- a/setup.py
+++ b/setup.py
@@ -1347,6 +1347,15 @@ class PyBuildExt(build_ext):
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 @@ class PyBuildExt(build_ext):
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