[Python-checkins] cpython (3.6): Issue #20211: Do not add the directory for installing C header files and

[xavier.degaye]

https://hg.python.org/cpython/rev/d1b400943483
changeset:   105616:d1b400943483
branch:      3.6
parent:      105610:0528a6743018
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Wed Dec 14 11:14:33 2016 +0100
summary:
  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.

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
@@ -53,6 +53,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.
 
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -532,8 +532,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