[Python-checkins] cpython (merge 3.6 -> default): Issue #20211: Merge 3.6.

Wed Dec 14 05:16:39 EST 2016

https://hg.python.org/cpython/rev/fcc9f19fcc13
changeset: 105617:fcc9f19fcc13
parent: 105612:64afd5cab40a
parent: 105616:d1b400943483
user: Xavier de Gaye <xdegaye at users.sourceforge.net>
date: Wed Dec 14 11:16:06 2016 +0100
summary:
 Issue #20211: Merge 3.6.
files:
 Misc/NEWS | 4 ++++
 setup.py | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -540,6 +540,10 @@
 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
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -533,8 +533,9 @@
 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
-- 
Repository URL: https://hg.python.org/cpython
