When building with --disable-toolbox-glue under Darwin, skip building any
Mac-specific modules. Before all modules were compiled but would fail thanks to a dependence on the code included when Python was built without the compiler flag. Closes bug #991962.
This commit is contained in:
parent
71f55af826
commit
cc8a4f6563
|
@ -139,6 +139,9 @@ Tools/Demos
|
|||
Build
|
||||
-----
|
||||
|
||||
- bug #991962: When building with --disable-toolbox-glue on Darwin no
|
||||
attempt to build Mac-specific modules occurs.
|
||||
|
||||
- The --with-tsc flag to configure to enable VM profiling with the
|
||||
processor's timestamp counter now works on PPC platforms.
|
||||
|
||||
|
|
6
setup.py
6
setup.py
|
@ -119,7 +119,8 @@ class PyBuildExt(build_ext):
|
|||
|
||||
# Platform-dependent module source and include directories
|
||||
platform = self.get_platform()
|
||||
if platform in ('darwin', 'mac'):
|
||||
if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in
|
||||
sysconfig.get_config_var("CONFIG_ARGS")):
|
||||
# Mac OS X also includes some mac-specific modules
|
||||
macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules')
|
||||
moddirlist.append(macmoddir)
|
||||
|
@ -789,7 +790,8 @@ class PyBuildExt(build_ext):
|
|||
# SunOS specific modules
|
||||
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
|
||||
|
||||
if platform == 'darwin':
|
||||
if platform == 'darwin' and ("--disable-toolbox-glue" not in
|
||||
sysconfig.get_config_var("CONFIG_ARGS")):
|
||||
# Mac OS X specific modules.
|
||||
exts.append( Extension('_CF', ['cf/_CFmodule.c', 'cf/pycfbridge.c'],
|
||||
extra_link_args=['-framework', 'CoreFoundation']) )
|
||||
|
|
Loading…
Reference in New Issue