diff -r d31bdde0dd90 setup.py
--- a/setup.py Wed Dec 14 10:56:54 2016 +0100
+++ b/setup.py Wed Dec 14 11:05:40 2016 +0100
@@ -424,10 +424,10 @@
'/usr/lib/' + multiarch_path_component)
add_dir_to_list(self.compiler.include_dirs,
'/usr/include/' + multiarch_path_component)
- return
+ return True
if not find_executable('dpkg-architecture'):
- return
+ return False
opt = ''
if cross_compiling:
opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
@@ -445,8 +445,10 @@
'/usr/lib/' + multiarch_path_component)
add_dir_to_list(self.compiler.include_dirs,
'/usr/include/' + multiarch_path_component)
+ return True
finally:
os.unlink(tmpfile)
+ return False
def add_gcc_paths(self):
gcc = sysconfig.get_config_var('CC')
@@ -497,7 +499,7 @@
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
self.add_gcc_paths()
- self.add_multiarch_paths()
+ is_multiarch = self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -533,7 +535,7 @@
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
- if (not cross_compiling and
+ if ((not cross_compiling or is_multiarch) 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