mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
Apply Jack's patch attached to
[ 508779 ] Disable flat namespace on MacOS X I presume you wanted this on the trunk too, Jack? 2.2.1 candidate.
This commit is contained in:
parent
02b28ec316
commit
0c46c0cc70
|
@ -793,8 +793,9 @@ then
|
|||
# Link against the framework. All externals should be defined.
|
||||
LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
|
||||
else
|
||||
# No framework. Ignore undefined symbols, assuming they come from Python
|
||||
LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
|
||||
# No framework, use the Python app as bundle-loader
|
||||
BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
|
||||
LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
|
||||
fi ;;
|
||||
Linux*|GNU*) LDSHARED="gcc -shared";;
|
||||
dgux*) LDSHARED="ld -G";;
|
||||
|
|
9
setup.py
9
setup.py
|
@ -604,7 +604,8 @@ def detect_modules(self):
|
|||
# available here. This Makefile variable is also what the install
|
||||
# procedure triggers on.
|
||||
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
|
||||
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
|
||||
exts.append( Extension('gestalt', ['gestaltmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('MacOS', ['macosmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('icglue', ['icgluemodule.c'],
|
||||
|
@ -613,8 +614,10 @@ def detect_modules(self):
|
|||
['macfsmodule.c',
|
||||
'../Python/getapplbycreator.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
|
||||
exts.append( Extension('_Res', ['res/_Resmodule.c']) )
|
||||
exts.append( Extension('_CF', ['cf/_CFmodule.c'],
|
||||
extra_link_args=['-framework', 'CoreFoundation']) )
|
||||
exts.append( Extension('_Res', ['res/_Resmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
if frameworkdir:
|
||||
|
|
Loading…
Reference in a new issue