Changeset 904702d for waflib/Tools/ifort.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/ifort.py (modified) (2 diffs)

waflib/Tools/ifort.py

@@ -10 +10 @@
 def find_ifort(conf):
         fc=conf.find_program('ifort',var='FC')
-        fc=conf.cmd_to_list(fc)
         conf.get_ifort_version(fc)
         conf.env.FC_NAME='IFORT'
@@ -30 +29 @@
 @conf
 def get_ifort_version(conf,fc):
-        version_re=re.compile(r"ifort\s*\(IFORT\)\s*(?P<major>\d*)\.(?P<minor>\d*)",re.I).search
-        cmd=fc+['--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:
+                cmd=fc
+        else:
+                cmd=fc+['-logo']
         out,err=fc_config.getoutput(conf,cmd,stdin=False)
         if out: