diff options
| author | makise-homura <akemi_homura@kurisa.ch> | 2021-09-29 22:46:43 +0300 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-09-29 20:16:02 -0700 |
| commit | e58b3adc7044980bbddca1ad9674ac7b0c5bac0a (patch) | |
| tree | 241c17223b9835c171315271fadc69981e25607f /mesonbuild/compilers | |
| parent | 613c9e26c420a7937bc2d17de5d98c6fee5c665a (diff) | |
| download | meson-e58b3adc7044980bbddca1ad9674ac7b0c5bac0a.zip meson-e58b3adc7044980bbddca1ad9674ac7b0c5bac0a.tar.gz meson-e58b3adc7044980bbddca1ad9674ac7b0c5bac0a.tar.bz2 | |
Fix mypy errors
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 13 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/elbrus.py | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index f751abe..efeb83c 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -694,14 +694,17 @@ def detect_fortran_compiler(env: 'Environment', for_machine: MachineChoice) -> C if guess_gcc_or_lcc == 'lcc': version = _get_lcc_version_from_defines(defines) cls = ElbrusFortranCompiler + linker = guess_nix_linker(env, compiler, cls, for_machine) + return cls( + compiler, version, for_machine, is_cross, info, + exe_wrap, defines, full_version=full_version, linker=linker) else: version = _get_gnu_version_from_defines(defines) cls = GnuFortranCompiler - linker = guess_nix_linker(env, compiler, cls, for_machine) - return cls( - compiler, version, for_machine, is_cross, info, - exe_wrap, defines, full_version=full_version, - linker=linker) + linker = guess_nix_linker(env, compiler, cls, for_machine) + return cls( + compiler, version, for_machine, is_cross, info, + exe_wrap, defines, full_version=full_version, linker=linker) if 'G95' in out: cls = G95FortranCompiler diff --git a/mesonbuild/compilers/mixins/elbrus.py b/mesonbuild/compilers/mixins/elbrus.py index 77c7ecb..80fbe12 100644 --- a/mesonbuild/compilers/mixins/elbrus.py +++ b/mesonbuild/compilers/mixins/elbrus.py @@ -25,6 +25,7 @@ from ...mesonlib import Popen_safe, OptionKey if T.TYPE_CHECKING: from ...environment import Environment + from ...coredata import KeyedOptionDictType class ElbrusCompiler(GnuLikeCompiler): |