38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From ad463b5d58ae79f69b011fb048861bd874d34369 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Date: Wed, 23 Dec 2015 11:36:27 +0100
|
||
|
|
Subject: [PATCH] Don't add multiarch paths
|
||
|
|
|
||
|
|
The add_multiarch_paths() function leads, in certain build
|
||
|
|
environments, to the addition of host header paths to the CFLAGS,
|
||
|
|
which is not appropriate for cross-compilation. This patch fixes that
|
||
|
|
by simply removing the call to add_multiarch_paths() when we're
|
||
|
|
cross-compiling.
|
||
|
|
|
||
|
|
Investigation done by David <buildroot-2014@inbox.com>.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
---
|
||
|
|
setup.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/setup.py b/setup.py
|
||
|
|
index 1904898165..32294546b6 100644
|
||
|
|
--- a/setup.py
|
||
|
|
+++ b/setup.py
|
||
|
|
@@ -852,10 +852,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):
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|