From bef2cf13ec230abd1c8e6dcaf2867a1b0e88206b Mon Sep 17 00:00:00 2001 From: Schildkroete23 Date: Thu, 19 Oct 2017 08:27:37 +0200 Subject: [PATCH] Use correct batch filed and function for Intel Fortran detection on Windows. (#2063) --- waflib/Tools/ifort.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/waflib/Tools/ifort.py b/waflib/Tools/ifort.py index 20e94332..74e4cb9b 100644 --- a/waflib/Tools/ifort.py +++ b/waflib/Tools/ifort.py @@ -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