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

Use correct batch filed and function for Intel Fortran detection on Windows. (#2063)

This commit is contained in:
Schildkroete23 2017-10-19 08:27:37 +02:00 committed by ita1024
parent 0be92e74ac
commit bef2cf13ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waflib/Tools/ifort.py
View File

@ -137,7 +137,7 @@ def gather_ifort_versions(conf, versions):
except OSError:
pass
else:
batch_file=os.path.join(path,'bin','iclvars.bat')
batch_file=os.path.join(path,'bin','ifortvars.bat')
if os.path.isfile(batch_file):
targets[target] = target_compiler(conf, 'intel', arch, version, target, batch_file)
@ -148,7 +148,7 @@ def gather_ifort_versions(conf, versions):
except OSError:
continue
else:
batch_file=os.path.join(path,'bin','iclvars.bat')
batch_file=os.path.join(path,'bin','ifortvars.bat')
if os.path.isfile(batch_file):
targets[target] = target_compiler(conf, 'intel', arch, version, target, batch_file)
major = version[0:2]
@ -278,7 +278,7 @@ class target_compiler(object):
return
self.is_done = True
try:
vs = self.conf.get_msvc_version(self.compiler, self.version, self.bat_target, self.bat)
vs = self.conf.get_ifort_version_win32(self.compiler, self.version, self.bat_target, self.bat)
except Errors.ConfigurationError:
self.is_valid = False
return