mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 77380 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77380 | tarek.ziade | 2010-01-09 00:57:53 +0100 (Sat, 09 Jan 2010) | 9 lines

  Merged revisions 77377 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77377 | tarek.ziade | 2010-01-09 00:42:23 +0100 (Sat, 09 Jan 2010) | 1 line

    Fixed #7617: all flavors of gcc should be recognized now
  ........
................
This commit is contained in:
Tarek Ziadé 2010-01-09 00:03:39 +00:00
parent 1a2d3563f9
commit 5e9615fa60
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/distutils/unixccompiler.py
View file

@ -264,6 +264,9 @@ class UnixCCompiler(CCompiler):
def library_dir_option(self, dir):
return "-L" + dir
def _is_gcc(self, compiler_name):
return "gcc" in compiler_name or "g++" in compiler_name
def runtime_library_dir_option(self, dir):
# XXX Hackish, at the very least. See Python bug #445902:
# http://sourceforge.net/tracker/index.php
@ -283,13 +286,13 @@ class UnixCCompiler(CCompiler):
# MacOSX's linker doesn't understand the -R flag at all
return "-L" + dir
elif sys.platform[:5] == "hp-ux":
if "gcc" in compiler or "g++" in compiler:
if self._is_gcc(compiler):
return ["-Wl,+s", "-L" + dir]
return ["+s", "-L" + dir]
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]
else:
if compiler[:3] == "gcc" or compiler[:3] == "g++":
if self._is_gcc(compiler):
# gcc on non-GNU systems does not need -Wl, but can
# use it anyway. Since distutils has always passed in
# -Wl whenever gcc was used in the past it is probably