diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-10-03 21:25:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-03 21:25:04 -0700 |
| commit | 10b44584ff0b1f49ece260a48f89eb59c123616f (patch) | |
| tree | 3bc4f127fe0ecfc81aed2d871820efa1aa133138 /mesonbuild/environment.py | |
| parent | 264939963f696cbf768b1d7c8011d72a8064323f (diff) | |
| parent | 2fe400c350a49930c3fbe86602efa9e0950bb1cb (diff) | |
| download | meson-10b44584ff0b1f49ece260a48f89eb59c123616f.zip meson-10b44584ff0b1f49ece260a48f89eb59c123616f.tar.gz meson-10b44584ff0b1f49ece260a48f89eb59c123616f.tar.bz2 | |
Merge pull request #7795 from dcbaker/submit/full-compiler-annotations
Full annotations for the Compiler package
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 513a03c..b9505b6 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 @@ -1324,8 +1324,8 @@ class Environment: cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler linker = self._guess_win_linker(['link'], cls, for_machine) return cls( - compiler, version, for_machine, is_cross, info, exe_wrap, - target, full_version=cl_signature, linker=linker) + compiler, version, for_machine, is_cross, info, target, + exe_wrap, full_version=cl_signature, linker=linker) if 'PGI Compilers' in out: cls = PGICCompiler if lang == 'c' else PGICPPCompiler self.coredata.add_lang_args(cls.language, cls, for_machine, self) @@ -1495,8 +1495,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, target, - info, exe_wrap, linker=linker) + compiler, version, for_machine, is_cross, info, + target, exe_wrap, linker=linker) if 'ifort (IFORT)' in out: linker = self._guess_nix_linker(compiler, IntelFortranCompiler, for_machine) |