From: Ned Deily <nad@acm.org>
Date: Thu, 16 May 2013 01:00:45 +0000 (-0700)
Subject: Issue #17990: Only modify include and library search paths when cross-compiling.
X-Git-Tag: v2.7.6rc1~389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6166709eec557f52075417b19676dccc9f405fda;p=thirdparty%2FPython%2Fcpython.git

Issue #17990: Only modify include and library search paths when cross-compiling.
---

diff --git a/setup.py b/setup.py
index 716f08e21123..8d8ec84d814f 100644
--- a/setup.py
+++ b/setup.py
@@ -437,9 +437,11 @@ class PyBuildExt(build_ext):
 
     def detect_modules(self):
         # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        self.add_gcc_paths()
+        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')
+        if cross_compiling:
+            self.add_gcc_paths()
         self.add_multiarch_paths()
 
         # Add paths specified in the environment variables LDFLAGS and