Mercurial > cpython-lru_cache-weakref
diff setup.py @ 65559:5cf1e6e61c6c 3.1
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.
........
| author | Ronald Oussoren <ronaldoussoren@mac.com> |
|---|---|
| date | Wed, 20 Oct 2010 13:40:38 +0000 |
| parents | 6543fa4b1458 |
| children | 5084ce948437 |
line wrap: on
line diff
--- a/setup.py Tue Oct 19 17:50:22 2010 +0000 +++ b/setup.py Wed Oct 20 13:40:38 2010 +0000 @@ -378,7 +378,12 @@ 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,