compilers/fortran: make ifort on windows signature match ICL's

pull/7795/head
Dylan Baker 4 years ago
parent ff51e1c5aa
commit b309f4904b
  1. 2
      mesonbuild/compilers/fortran.py
  2. 4
      mesonbuild/environment.py

@ -350,7 +350,7 @@ class IntelClFortranCompiler(IntelVisualStudioLikeCompiler, FortranCompiler):
always_args = ['/nologo'] always_args = ['/nologo']
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
is_cross: bool, target: str, info: 'MachineInfo', is_cross: bool, info: 'MachineInfo', target: str,
exe_wrapper: T.Optional['ExternalProgram'] = None, exe_wrapper: T.Optional['ExternalProgram'] = None,
linker: T.Optional['DynamicLinker'] = None, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None): full_version: T.Optional[str] = None):

@ -1495,8 +1495,8 @@ class Environment:
self.coredata.add_lang_args(cls.language, cls, for_machine, self) self.coredata.add_lang_args(cls.language, cls, for_machine, self)
linker = XilinkDynamicLinker(for_machine, [], version=version) linker = XilinkDynamicLinker(for_machine, [], version=version)
return cls( return cls(
compiler, version, for_machine, is_cross, target, compiler, version, for_machine, is_cross, info,
info, exe_wrap, linker=linker) target, exe_wrap, linker=linker)
if 'ifort (IFORT)' in out: if 'ifort (IFORT)' in out:
linker = self._guess_nix_linker(compiler, IntelFortranCompiler, for_machine) linker = self._guess_nix_linker(compiler, IntelFortranCompiler, for_machine)

Loading…
Cancel
Save