diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-10-08 08:04:15 +0000 |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-10-08 08:04:15 +0000 |
commit | ed3425ae5db9eb3b290f54ecb0e217b60f670f61 (patch) | |
tree | 016aa1328935659649b70b9c18fcd57a69801ca5 | |
parent | 5a7f1d3651fba5add250a518cb4a294553a67ed7 (diff) | |
download | cpython-ed3425ae5db9eb3b290f54ecb0e217b60f670f61.tar.gz |
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.py | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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 |