diff setup.py @ 83786:cd577c328886 2.7

Issue #17990: Only modify include and library search paths when cross-compiling.
author Ned Deily <nad@acm.org>
date Wed, 15 May 2013 18:00:45 -0700
parents 87331820569a
children c167ab1c49c9
line wrap: on
line diff
--- a/setup.py	Wed May 15 16:54:16 2013 +0200
+++ b/setup.py	Wed May 15 18:00:45 2013 -0700
@@ -437,9 +437,11 @@
 
     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