FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2025-01-27 10:40:02 +01:00
Code Issues Projects Releases Wiki Activity

Made the XLF version parsing consistent with the XLC one.

Browse Source
This commit is contained in:
Harald Klimach 2012-07-08 22:49:30 +02:00
parent 8d1ff034df
commit 312229d7bd
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
waflib/extras/fc_xlf.py
View File

@ -38,16 +38,21 @@ def xlf_modifier_platform(conf):
def get_xlf_version(conf, fc):
"""Get the compiler version"""
version_re = re.compile(r"IBM XL Fortran.*, V(?P<major>\d*)\.(?P<minor>\d*)", re.I).search
cmd = fc + ['-qversion']
try:
out, err = conf.cmd_and_log(cmd, output=0)
except Errors.WafError:
conf.fatal('Could not find xlf %r' % cmd)
out, err = fc_config.getoutput(conf,cmd,stdin=False)
if out: match = version_re(out)
else: match = version_re(err)
if not match:
for v in (r"IBM XL Fortran.*, V(?P<major>\d*)\.(?P<minor>\d*)", r"IBM XL Fortran.*Version: V(?P<major>\d*)\.(?P<minor>\d*)"
version_re = re.compile(v, re.I | re.M).search
match = version_re(out or err)
if match:
k = match.groupdict()
conf.env['FC_VERSION'] = (k['major'], k['minor'])
break
else:
conf.fatal('Could not determine the XLF version.')
k = match.groupdict()
conf.env['FC_VERSION'] = (k['major'], k['minor'])
def configure(conf):
conf.find_xlf()