summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-10-20 13:11:46 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-10-20 13:11:46 (GMT)
commit2421525e2147b8decfe58f8667212fbe0ff7f454 (patch)
tree09c88530f794ffc966574775281a4dbd4c79bc35 /setup.py
parent1e0a998d13085d06eb5db0818a89d19b4a885ccd (diff)
downloadcpython-2421525e2147b8decfe58f8667212fbe0ff7f454.zip
cpython-2421525e2147b8decfe58f8667212fbe0ff7f454.tar.gz
cpython-2421525e2147b8decfe58f8667212fbe0ff7f454.tar.bz2
Merged revisions 85744 via svnmerge from
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. ........
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 4f89559..cc5358f 100644
--- a/setup.py
+++ b/setup.py
@@ -384,7 +384,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,