mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Tidy up the ordering of include and library directories, putting

Browse source 
/usr/local first and leaving /usr/include at the end.  This addresses
    the comments in bug #232609.
This commit is contained in:
Andrew M. Kuchling 2001-03-17 16:56:35 +00:00
parent 84e87f379e
commit 9b5abcd48c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
setup.py
View file

@ -146,19 +146,19 @@ class PyBuildExt(build_ext):
def detect_modules(self): def detect_modules(self):
# Ensure that /usr/local is always used # Ensure that /usr/local is always used
if '/usr/local/lib' not in self.compiler.library_dirs: if '/usr/local/lib' not in self.compiler.library_dirs:
self.compiler.library_dirs.append('/usr/local/lib') self.compiler.library_dirs.insert(0, '/usr/local/lib')
if '/usr/local/include' not in self.compiler.include_dirs: if '/usr/local/include' not in self.compiler.include_dirs:
self.compiler.include_dirs.append( '/usr/local/include' ) self.compiler.include_dirs.insert(0, '/usr/local/include' )
# lib_dirs and inc_dirs are used to search for files; # lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can # if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed. # be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib'] lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
inc_dirs = ['/usr/include'] + self.compiler.include_dirs inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = [] exts = []
platform = self.get_platform() platform = self.get_platform()
# Check for MacOS X, which doesn't need libm.a at all # Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m'] math_libs = ['m']
if platform in ['Darwin1.2', 'beos']: if platform in ['Darwin1.2', 'beos']: