diff options
| author | Jason Tishler <jason@tishler.net> | 2003-04-09 20:13:59 +0000 |
|---|---|---|
| committer | Jason Tishler <jason@tishler.net> | 2003-04-09 20:13:59 +0000 |
| commit | 972516d3ad5fba97791d87ba95d126f3d6bcc5a2 (patch) | |
| tree | 7ee779b1827a497b1721c7874b57c3ba7b02d869 /cygwinccompiler.py | |
| parent | 1942fa31ea1b33d7fcccfed31d6cd2ebd46c7f60 (diff) | |
| download | python-setuptools-git-972516d3ad5fba97791d87ba95d126f3d6bcc5a2.tar.gz | |
Patch #718551: cygwinccompiler.get_versions() patch
The cygwinccompiler.get_versions() function only handles versions numbers of
the form "x.y.z". The attached patch enhances get_versions() to handle "x.y"
too (i.e., the ".z" is optional).
This change causes the unnecessary "--entry _DllMain@12" link option to be
suppressed for recent Cygwin and Mingw toolchains. Additionally, it directs
recent Mingw toolchains to use gcc instead of dllwrap during linking.
Diffstat (limited to 'cygwinccompiler.py')
| -rw-r--r-- | cygwinccompiler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cygwinccompiler.py b/cygwinccompiler.py index e86dc815..794dcdb5 100644 --- a/cygwinccompiler.py +++ b/cygwinccompiler.py @@ -357,7 +357,7 @@ def get_versions(): out = os.popen(gcc_exe + ' -dumpversion','r') out_string = out.read() out.close() - result = re.search('(\d+\.\d+\.\d+)',out_string) + result = re.search('(\d+\.\d+(\.\d+)*)',out_string) if result: gcc_version = StrictVersion(result.group(1)) else: @@ -369,7 +369,7 @@ def get_versions(): out = os.popen(ld_exe + ' -v','r') out_string = out.read() out.close() - result = re.search('(\d+\.\d+\.\d+)',out_string) + result = re.search('(\d+\.\d+(\.\d+)*)',out_string) if result: ld_version = StrictVersion(result.group(1)) else: @@ -381,7 +381,7 @@ def get_versions(): out = os.popen(dllwrap_exe + ' --version','r') out_string = out.read() out.close() - result = re.search(' (\d+\.\d+\.\d+)',out_string) + result = re.search(' (\d+\.\d+(\.\d+)*)',out_string) if result: dllwrap_version = StrictVersion(result.group(1)) else: |