aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorAndrei Alexeyev <akari@taisei-project.org>2019-10-02 00:50:08 +0300
committerDylan Baker <dylan@pnwbakers.com>2019-10-14 13:04:34 -0700
commit5e3eff9d72548a4990dae6bd3d84fbbdfb06bcc2 (patch)
treeec8749d333b9daad50eb9a29ee29c35467073d6a /mesonbuild/compilers
parentdd162dccaa50a28b6abbd505722b1efdb310c395 (diff)
downloadmeson-5e3eff9d72548a4990dae6bd3d84fbbdfb06bcc2.zip
meson-5e3eff9d72548a4990dae6bd3d84fbbdfb06bcc2.tar.gz
meson-5e3eff9d72548a4990dae6bd3d84fbbdfb06bcc2.tar.bz2
Remove BasicLinkerIsCompilerMixin from LDC and DMD
These compilers invoke external linkers and have the appropriate .linker property set. Therefore, BasicLinkerIsCompilerMixin appears to be misplaced. It used to work by chance, because BasicLinkerIsCompilerMixin failed to override the get_allow_undefined_link_args method. The D compilers do not provide their own get_allow_undefined_link_args, because they expect to inherit it from Compiler, which simply delegates it to the linker. Now that BasicLinkerIsCompilerMixin correctly overrides that method with a stub, it broke compilers that relied on the buggy behavior.
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/d.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index f028bd5..8f65af6 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -635,7 +635,7 @@ class GnuDCompiler(DCompiler, GnuCompiler):
return parameter_list
-class LLVMDCompiler(DmdLikeCompilerMixin, LinkerEnvVarsMixin, BasicLinkerIsCompilerMixin, DCompiler):
+class LLVMDCompiler(DmdLikeCompilerMixin, LinkerEnvVarsMixin, DCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
info: 'MachineInfo', arch, **kwargs):
@@ -674,7 +674,7 @@ class LLVMDCompiler(DmdLikeCompilerMixin, LinkerEnvVarsMixin, BasicLinkerIsCompi
return ldc_optimization_args[optimization_level]
-class DmdDCompiler(DmdLikeCompilerMixin, LinkerEnvVarsMixin, BasicLinkerIsCompilerMixin, DCompiler):
+class DmdDCompiler(DmdLikeCompilerMixin, LinkerEnvVarsMixin, DCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
info: 'MachineInfo', arch, **kwargs):