From 3c49de07a7d542615e0f76320609d0a2a55afd74 Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Mon, 18 Aug 2014 19:47:11 +0200 Subject: [PATCH] Modified ifort to use the -logo option for search of the compiler version. --- waflib/Tools/ifort.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/waflib/Tools/ifort.py b/waflib/Tools/ifort.py index 70935268..9e825b56 100644 --- a/waflib/Tools/ifort.py +++ b/waflib/Tools/ifort.py @@ -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\d*)\.(?P\d*)",re.I).search if Utils.is_win32: - version_re = re.compile(r"Intel[\sa-zA-Z()0-9,]*Version\s*(?P\d*)\.(?P\d*)",re.I).search - cmd = fc + ['/version'] + cmd = fc + ['/logo'] else: - version_re = re.compile(r"ifort\s*\(IFORT\)\s*(?P\d*)\.(?P\d*)",re.I).search - cmd = fc + ['--version'] + cmd = fc + ['-logo'] out, err = fc_config.getoutput(conf, cmd, stdin=False) if out: