summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-08-18 19:23:47 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-08-18 19:23:47 (GMT)
commit351ffb80c3fffc2996cc320fd9e0eaf3778eba25 (patch)
tree68cae3a2d1cb3725df982beb86b69dbc0b4da5d6 /Lib/distutils
parent26f521668a52d233597c713fd20a294437ad1c26 (diff)
downloadcpython-351ffb80c3fffc2996cc320fd9e0eaf3778eba25.zip
cpython-351ffb80c3fffc2996cc320fd9e0eaf3778eba25.tar.gz
cpython-351ffb80c3fffc2996cc320fd9e0eaf3778eba25.tar.bz2
#2234 distutils failed with mingw binutils 2.18.50.20080109.
Be less strict when parsing these version numbers, they don't necessarily follow the python numbering scheme.
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/cygwinccompiler.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index 4ac11eb..94a7bd9 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -404,7 +404,7 @@ def get_versions():
""" Try to find out the versions of gcc, ld and dllwrap.
If not possible it returns None for it.
"""
- from distutils.version import StrictVersion
+ from distutils.version import LooseVersion
from distutils.spawn import find_executable
import re
@@ -415,7 +415,7 @@ def get_versions():
out.close()
result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result:
- gcc_version = StrictVersion(result.group(1))
+ gcc_version = LooseVersion(result.group(1))
else:
gcc_version = None
else:
@@ -427,7 +427,7 @@ def get_versions():
out.close()
result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result:
- ld_version = StrictVersion(result.group(1))
+ ld_version = LooseVersion(result.group(1))
else:
ld_version = None
else:
@@ -439,7 +439,7 @@ def get_versions():
out.close()
result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
if result:
- dllwrap_version = StrictVersion(result.group(1))
+ dllwrap_version = LooseVersion(result.group(1))
else:
dllwrap_version = None
else: