From a5b642c9332333f78876f8ae5ccde8d055fda5ea Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 8 Oct 2009 08:04:15 +0000 Subject: Ensure that _scproxy gets build even when --disable-toolbox-glue is specified on OSX. Fixes a regression in 2.6.3. --- setup.py | 18 +++++++++--------- 1 file 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 -- cgit v0.12