[Python-checkins] cpython (2.7): Issue #17990: Only modify include and library search paths when cross-compiling.
ned.deily
python-checkins at python.org
Thu May 16 03:02:49 CEST 2013
http://hg.python.org/cpython/rev/cd577c328886
changeset: 83786:cd577c328886
branch: 2.7
parent: 83775:149340b3004a
user: Ned Deily <nad at acm.org>
date: Wed May 15 18:00:45 2013 -0700
summary:
Issue #17990: Only modify include and library search paths when cross-compiling.
files:
setup.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list