diff options
author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-14 11:16:06 +0100 |
---|---|---|
committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-14 11:16:06 +0100 |
commit | e43edaad7e2ba2132662267745c73754fc3b2d77 (patch) | |
tree | 11979df8e573eb396190cc177959e27b92dd2754 | |
parent | f2392133eba777f05947a8996c507690b95379c3 (diff) | |
parent | 1351c31aa9651b278d7ef8ec79af3b646a520235 (diff) | |
download | cpython-git-e43edaad7e2ba2132662267745c73754fc3b2d77.tar.gz |
Issue #20211: Merge 3.6.
-rw-r--r-- | Misc/NEWS | 4 | ||||
-rw-r--r-- | setup.py | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -540,6 +540,10 @@ Documentation 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 #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and @@ -533,8 +533,9 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) - if os.path.normpath(sys.base_prefix) != '/usr' \ - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): + if (not cross_compiling and + 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 # (PYTHONFRAMEWORK is set) to avoid # linking problems when # building a framework with different architectures than |