From 1351c31aa9651b278d7ef8ec79af3b646a520235 Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Wed, 14 Dec 2016 11:14:33 +0100 Subject: [PATCH] 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. --- Misc/NEWS | 4 ++++ setup.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index f4433daf803..97502a999b0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -53,6 +53,10 @@ Tests 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 index 7cb1141dac7..d218722e0e6 100644 --- a/setup.py +++ b/setup.py @@ -532,8 +532,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