diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-09-21 18:17:16 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-10-01 15:05:00 -0700 |
| commit | fe97977b00e2b3c0fec9bc85aa0bf3e11559802a (patch) | |
| tree | 578ddd7e5967e27ef89ae5605d3780ba828dd05b /mesonbuild/environment.py | |
| parent | 96a1ae6dfe9209d907803b9f2ecca29d2047a47f (diff) | |
| download | meson-fe97977b00e2b3c0fec9bc85aa0bf3e11559802a.zip meson-fe97977b00e2b3c0fec9bc85aa0bf3e11559802a.tar.gz meson-fe97977b00e2b3c0fec9bc85aa0bf3e11559802a.tar.bz2 | |
compilers/cpp: Add type annotations
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ac77ef1..eb2d84d 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1205,7 +1205,7 @@ class Environment: return cls( ccache + compiler, version, for_machine, is_cross, - info, exe_wrap, defines, full_version=full_version, + info, exe_wrap, defines=defines, full_version=full_version, linker=linker) if 'Emscripten' in out: @@ -1264,8 +1264,8 @@ class Environment: cls = ClangClCCompiler if lang == 'c' else ClangClCPPCompiler linker = self._guess_win_linker(['lld-link'], cls, for_machine) return cls( - compiler, version, for_machine, is_cross, info, exe_wrap, - target, linker=linker) + compiler, version, for_machine, is_cross, info, target, + exe_wrap, linker=linker) if 'clang' in out or 'Clang' in out: linker = None @@ -1291,7 +1291,7 @@ class Environment: return cls( ccache + compiler, version, for_machine, is_cross, info, - exe_wrap, defines, full_version=full_version, linker=linker) + exe_wrap, defines=defines, full_version=full_version, linker=linker) if 'Intel(R) C++ Intel(R)' in err: version = search_version(err) @@ -1300,8 +1300,8 @@ class Environment: self.coredata.add_lang_args(cls.language, cls, for_machine, self) linker = XilinkDynamicLinker(for_machine, [], version=version) return cls( - compiler, version, for_machine, is_cross, info=info, - exe_wrap=exe_wrap, target=target, linker=linker) + compiler, version, for_machine, is_cross, info, target, + exe_wrap, linker=linker) if 'Microsoft' in out or 'Microsoft' in err: # Latest versions of Visual Studio print version # number to stderr but earlier ones print version |