From 2638d0cf21c952290ac30b881f214074532f29ef Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Fri, 6 Sep 2019 20:05:56 -0700 Subject: [PATCH] bpo-38047: don't add multi-arch paths if cross compiling. --- Misc/NEWS.d/next/Build/2019-09-06-19-40-21.bpo-38047.S0PTLV.rst | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2019-09-06-19-40-21.bpo-38047.S0PTLV.rst diff --git a/Misc/NEWS.d/next/Build/2019-09-06-19-40-21.bpo-38047.S0PTLV.rst b/Misc/NEWS.d/next/Build/2019-09-06-19-40-21.bpo-38047.S0PTLV.rst new file mode 100644 index 00000000000000..54383c807e671e --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-09-06-19-40-21.bpo-38047.S0PTLV.rst @@ -0,0 +1 @@ +multi-arch headers and libs will not be added when cross compiling. diff --git a/setup.py b/setup.py index 02f523c42d355f..7dc98f67f07ae2 100644 --- a/setup.py +++ b/setup.py @@ -651,10 +651,10 @@ def configure_compiler(self): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() # only change this for cross builds for 3.3, issues on Mageia if CROSS_COMPILING: self.add_cross_compiling_paths() - self.add_multiarch_paths() self.add_ldflags_cppflags() def init_inc_lib_dirs(self):