diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-08 23:42:23 +0000 |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-08 23:42:23 +0000 |
commit | c25417f64467f00bc4f271f5979810ea13563a9f (patch) | |
tree | 4fe293c986d10bfde620165b28e3d03625a0f916 /Lib/distutils/unixccompiler.py | |
parent | 5b77d6dfa39a0a7d6c3668c476b36e6d34cb96f3 (diff) | |
download | cpython-git-c25417f64467f00bc4f271f5979810ea13563a9f.tar.gz |
Fixed #7617: all flavors of gcc should be recognized now
Diffstat (limited to 'Lib/distutils/unixccompiler.py')
-rw-r--r-- | Lib/distutils/unixccompiler.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py index 2083f82982..67adcfcf97 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -266,6 +266,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 @@ -285,12 +288,12 @@ 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] - elif compiler[:3] == "gcc" or compiler[:3] == "g++": + elif 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 |