diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-14 13:42:11 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-23 01:59:31 +0200 |
| commit | a55e3434c52d53381d17a208acd2a3603913f8e5 (patch) | |
| tree | fe11a6dee8f4295b309149c6831d9b156e1c2f93 | |
| parent | 712b2f08c7126863a68dc98c021fc40a4de462fd (diff) | |
| download | meson-a55e3434c52d53381d17a208acd2a3603913f8e5.zip meson-a55e3434c52d53381d17a208acd2a3603913f8e5.tar.gz meson-a55e3434c52d53381d17a208acd2a3603913f8e5.tar.bz2 | |
environment: Fix initialization of compilers that don't use a
_guess_linker method
Fixes #6448
| -rw-r--r-- | mesonbuild/environment.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 7cc6f5b..58c9e99 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -946,6 +946,7 @@ class Environment: if 'Emscripten' in out: cls = EmscriptenCCompiler if lang == 'c' else EmscriptenCPPCompiler + self.coredata.add_lang_args(cls.language, cls, for_machine, self) return cls( ccache + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version) @@ -966,6 +967,7 @@ class Environment: full_version = arm_ver_str cls = ArmclangCCompiler if lang == 'c' else ArmclangCPPCompiler linker = ArmClangDynamicLinker(for_machine, version=version) + self.coredata.add_lang_args(cls.language, cls, for_machine, self) return cls( ccache + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=linker) @@ -1061,12 +1063,14 @@ class Environment: exe_wrap, full_version=full_version, linker=l) if 'ARM' in out: cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler + self.coredata.add_lang_args(cls.language, cls, for_machine, self) linker = ArmDynamicLinker(for_machine, version=version) return cls( ccache + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=linker) if 'RX Family' in out: cls = CcrxCCompiler if lang == 'c' else CcrxCPPCompiler + self.coredata.add_lang_args(cls.language, cls, for_machine, self) linker = CcrxDynamicLinker(for_machine, version=version) return cls( ccache + compiler, version, for_machine, is_cross, info, @@ -1419,6 +1423,7 @@ class Environment: compiler.extend(['-C', 'linker={}'.format(c)]) compiler.extend(['-C', 'link-args={}'.format(' '.join(cc.use_linker_args(override[0])))]) + self.coredata.add_lang_args(RustCompiler.language, RustCompiler, for_machine, self) return RustCompiler( compiler, version, for_machine, is_cross, info, exe_wrap, linker=linker) |