diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-06-20 14:07:01 -0400 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-06-24 14:06:32 -0400 |
| commit | 5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9 (patch) | |
| tree | 5c28afec73ad304f9e27e6a873492adb39b94139 /mesonbuild/environment.py | |
| parent | 59e5ad66f2017e17692d64e2aa7d745ea3fe849d (diff) | |
| download | meson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.zip meson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.tar.gz meson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.tar.bz2 | |
correct missing argument for IntelClFortranCompiler
ifort passes all tests
cleanup logic
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 555c21c..adae8f1 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -854,7 +854,7 @@ class Environment: return cls(ccache + compiler, version, for_machine, exe_wrap) raise EnvironmentException('Could not find suitable CUDA compiler: "' + ' '.join(compilers) + '"') - def detect_fortran_compiler(self, for_machine): + def detect_fortran_compiler(self, for_machine: MachineChoice): popen_exceptions = {} compilers, ccache, exe_wrap = self._get_compilers('fortran', for_machine) is_cross = not self.machines.matches_build_machine(for_machine) @@ -901,7 +901,7 @@ class Environment: if 'Intel(R) Visual Fortran' in err: version = search_version(err) target = 'x86' if 'IA-32' in err else 'x86_64' - return IntelClFortranCompiler(compiler, version, is_cross, target, exe_wrap) + return IntelClFortranCompiler(compiler, version, for_machine, is_cross, target, exe_wrap) if 'ifort (IFORT)' in out: return IntelFortranCompiler(compiler, version, for_machine, is_cross, exe_wrap, full_version=full_version) |