diff options
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 555c21c..0cf511f 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -792,7 +792,7 @@ class Environment: else: compiler_type = CompilerType.PGI_STANDARD cls = PGICCompiler if lang == 'c' else PGICPPCompiler - return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, compiler_type, exe_wrap) + return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap) if '(ICC)' in out: if self.machines[for_machine].is_darwin(): compiler_type = CompilerType.ICC_OSX @@ -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) |