mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #20211: Merge 3.6.

Browse source
This commit is contained in:
Xavier de Gaye 2016-12-14 11:16:06 +01:00
commit e43edaad7e
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -540,6 +540,10 @@ Documentation
Build Build
----- -----
- Issue #20211: Do not add the directory for installing C header files and the
directory for installing object code libraries to the cross compilation
search paths. Original patch by Thomas Petazzoni.
- Issue #28849: Do not define sys.implementation._multiarch on Android. - Issue #28849: Do not define sys.implementation._multiarch on Android.
- Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and - Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and

5
setup.py
View file

@ -533,8 +533,9 @@ class PyBuildExt(build_ext):
for directory in reversed(options.dirs): for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory) add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.base_prefix) != '/usr' \ if (not cross_compiling and
and not sysconfig.get_config_var('PYTHONFRAMEWORK'): os.path.normpath(sys.base_prefix) != '/usr' and
not sysconfig.get_config_var('PYTHONFRAMEWORK')):
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when # (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than # building a framework with different architectures than