diff options
| author | miebka <86464051+miebka@users.noreply.github.com> | 2021-06-30 21:44:05 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-01 01:58:24 +0300 |
| commit | 3021f256ea8873aa5d37713775796406c81449c7 (patch) | |
| tree | 32e9141627e74a4a17873919b1b93e6107244e2b | |
| parent | 6337e40115278fffd8b331d5a32324167e196c1b (diff) | |
| download | meson-3021f256ea8873aa5d37713775796406c81449c7.zip meson-3021f256ea8873aa5d37713775796406c81449c7.tar.gz meson-3021f256ea8873aa5d37713775796406c81449c7.tar.bz2 | |
C2000: linker uses now binary setting defined within the cross-file
| -rw-r--r-- | mesonbuild/compilers/detect.py | 2 | ||||
| -rw-r--r-- | mesonbuild/linkers/linkers.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 59eac85..a86366a 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -616,7 +616,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin if 'TMS320C2000 C/C++' in out: cls = C2000CCompiler if lang == 'c' else C2000CPPCompiler env.coredata.add_lang_args(cls.language, cls, for_machine, env) - linker = C2000DynamicLinker(for_machine, version=version) + linker = C2000DynamicLinker(compiler, for_machine, version=version) return cls( ccache + compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=linker) diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index 6ebdbcb..4457330 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -982,9 +982,9 @@ class C2000DynamicLinker(DynamicLinker): id = 'cl2000' - def __init__(self, for_machine: mesonlib.MachineChoice, + def __init__(self, exelist: T.List[str], for_machine: mesonlib.MachineChoice, *, version: str = 'unknown version'): - super().__init__(['cl2000.exe'], for_machine, '', [], + super().__init__(exelist or ['cl2000.exe'], for_machine, '', [], version=version) def get_link_whole_for(self, args: T.List[str]) -> T.List[str]: |