mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-01 06:28:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 85744 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85744 | ronald.oussoren | 2010-10-20 15:10:12 +0200 (Wed, 20 Oct 2010) | 7 lines

  Fix for issue #7473.

  Without this patch you'll get link errors in some extensions
  (in particular the _curses_panel) one when you try to build
  a 3-way universal framework when you previously installed a
  2-way universal framework using the python.org installer.
........
This commit is contained in:
Ronald Oussoren 2010-10-20 13:40:38 +00:00
parent 455b0db6ff
commit 7e7dbab08a
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
setup.py
View file

@ -378,7 +378,12 @@ class PyBuildExt(build_ext):
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.prefix) != '/usr':
if os.path.normpath(sys.prefix) != '/usr' \
and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than
# the one that is currently installed (issue #7473)
add_dir_to_list(self.compiler.library_dirs,
sysconfig.get_config_var("LIBDIR"))
add_dir_to_list(self.compiler.include_dirs,