Mercurial > cpython

changeset 83786:cd577c328886 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #17990: Only modify include and library search paths when cross-compiling. [#17990]
author Ned Deily <nad@acm.org>
date Wed, 15 May 2013 18:00:45 -0700
parents 149340b3004a
children d91da96a55bf
files setup.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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