Issue #20211: Merge 3.6.

This commit is contained in:
Xavier de Gaye 2016-12-14 11:16:06 +01:00
commit e43edaad7e
2 changed files with 7 additions and 2 deletions

View file

@ -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