Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Xavier de Gaye 2016-12-14 11:14:33 +01:00
parent 7262b42fd1
commit 1351c31aa9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -53,6 +53,10 @@ Tests
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.

5
setup.py
View File

@ -532,8 +532,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