FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modified ifort to use the -logo option for search of the compiler version.

This commit is contained in:
Harald Klimach 2014-08-18 19:47:11 +02:00
parent 002badce44
commit 3c49de07a7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/Tools/ifort.py
View File

@ -37,12 +37,11 @@ def ifort_modifier_platform(conf):
def get_ifort_version(conf, fc):
"""get the compiler version"""
version_re = re.compile(r"Intel[\sa-zA-Z()0-9,]*Version\s*(?P<major>\d*)\.(?P<minor>\d*)",re.I).search
if Utils.is_win32:
version_re = re.compile(r"Intel[\sa-zA-Z()0-9,]*Version\s*(?P<major>\d*)\.(?P<minor>\d*)",re.I).search
cmd = fc + ['/version']
cmd = fc + ['/logo']
else:
version_re = re.compile(r"ifort\s*\(IFORT\)\s*(?P<major>\d*)\.(?P<minor>\d*)",re.I).search
cmd = fc + ['--version']
cmd = fc + ['-logo']
out, err = fc_config.getoutput(conf, cmd, stdin=False)
if out: