mirror of https://gitlab.com/ita1024/waf.git
Modified ifort to use the -logo option for search of the compiler version.
This commit is contained in:
parent
002badce44
commit
3c49de07a7
|
@ -37,12 +37,11 @@ def ifort_modifier_platform(conf):
|
||||||
def get_ifort_version(conf, fc):
|
def get_ifort_version(conf, fc):
|
||||||
"""get the compiler version"""
|
"""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:
|
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 + ['/logo']
|
||||||
cmd = fc + ['/version']
|
|
||||||
else:
|
else:
|
||||||
version_re = re.compile(r"ifort\s*\(IFORT\)\s*(?P<major>\d*)\.(?P<minor>\d*)",re.I).search
|
cmd = fc + ['-logo']
|
||||||
cmd = fc + ['--version']
|
|
||||||
|
|
||||||
out, err = fc_config.getoutput(conf, cmd, stdin=False)
|
out, err = fc_config.getoutput(conf, cmd, stdin=False)
|
||||||
if out:
|
if out:
|
||||||
|
|
Loading…
Reference in New Issue