mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Patch #718551: cygwinccompiler.get_versions() patch

Browse source 
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.
This commit is contained in:
Jason Tishler 2003-04-09 20:13:59 +00:00
parent 11d204ca27
commit dcae0dc4ed
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/cygwinccompiler.py
View file

@ -357,7 +357,7 @@ def get_versions():
out = os.popen(gcc_exe + ' -dumpversion','r') out = os.popen(gcc_exe + ' -dumpversion','r')
out_string = out.read() out_string = out.read()
out.close() out.close()
result = re.search('(\d+\.\d+\.\d+)',out_string) result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result: if result:
gcc_version = StrictVersion(result.group(1)) gcc_version = StrictVersion(result.group(1))
else: else:
@ -369,7 +369,7 @@ def get_versions():
out = os.popen(ld_exe + ' -v','r') out = os.popen(ld_exe + ' -v','r')
out_string = out.read() out_string = out.read()
out.close() out.close()
result = re.search('(\d+\.\d+\.\d+)',out_string) result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result: if result:
ld_version = StrictVersion(result.group(1)) ld_version = StrictVersion(result.group(1))
else: else:
@ -381,7 +381,7 @@ def get_versions():
out = os.popen(dllwrap_exe + ' --version','r') out = os.popen(dllwrap_exe + ' --version','r')
out_string = out.read() out_string = out.read()
out.close() out.close()
result = re.search(' (\d+\.\d+\.\d+)',out_string) result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
if result: if result:
dllwrap_version = StrictVersion(result.group(1)) dllwrap_version = StrictVersion(result.group(1))
else: else: