diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-15 11:33:32 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-22 23:39:33 +0200 |
| commit | 255fa5a320369f6a7b52f2963574a09e7e693d9a (patch) | |
| tree | b482d468606c0675975a0594db98015d9730402c /mesonbuild/environment.py | |
| parent | 730a7b296fdff8aca58e15829485b3b68262d3c0 (diff) | |
| download | meson-255fa5a320369f6a7b52f2963574a09e7e693d9a.zip meson-255fa5a320369f6a7b52f2963574a09e7e693d9a.tar.gz meson-255fa5a320369f6a7b52f2963574a09e7e693d9a.tar.bz2 | |
tests: Add a test case for finding ld
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 122301f..7cc6f5b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -749,7 +749,7 @@ class Environment: check_args += self.coredata.compiler_options[for_machine][comp_class.language + '_args'].value override = [] # type: T.List[str] - value = self.binaries[for_machine].lookup_entry(comp_class.language + 'ld') + value = self.binaries[for_machine].lookup_entry(comp_class.language + '_ld') if value is not None: override = comp_class.use_linker_args(value[0]) check_args += override @@ -812,7 +812,7 @@ class Environment: check_args = comp_class.LINKER_PREFIX + ['--version'] + extra_args override = [] # type: T.List[str] - value = self.binaries[for_machine].lookup_entry(comp_class.language + 'ld') + value = self.binaries[for_machine].lookup_entry(comp_class.language + '_ld') if value is not None: override = comp_class.use_linker_args(value[0]) check_args += override @@ -1355,7 +1355,7 @@ class Environment: cc = self.detect_c_compiler(for_machine) is_link_exe = isinstance(cc.linker, VisualStudioLikeLinkerMixin) - override = self.binaries[for_machine].lookup_entry('rustld') + override = self.binaries[for_machine].lookup_entry('rust_ld') for compiler in compilers: if isinstance(compiler, str): |