aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/c.py
diff options
context:
space:
mode:
authormakise-homura <akemi_homura@kurisa.ch>2021-09-28 23:26:31 +0300
committerDylan Baker <dylan@pnwbakers.com>2021-09-29 20:16:02 -0700
commitd9b379df87815b9ffddfb1d146d6201dc4df7a48 (patch)
tree37ad2b4ad428df42c135bb893e029becb4973d54 /mesonbuild/compilers/c.py
parentfc3de287cbcd38fdbd06e1a81bb9a8d4ccd0c008 (diff)
downloadmeson-d9b379df87815b9ffddfb1d146d6201dc4df7a48.zip
meson-d9b379df87815b9ffddfb1d146d6201dc4df7a48.tar.gz
meson-d9b379df87815b9ffddfb1d146d6201dc4df7a48.tar.bz2
compilers/elbrus: Fix incorrect inheritance model of Elbrus*Compiler
Diffstat (limited to 'mesonbuild/compilers/c.py')
-rw-r--r--mesonbuild/compilers/c.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 33d6148..a096442 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -323,15 +323,14 @@ class NvidiaHPC_CCompiler(PGICompiler, CCompiler):
self.id = 'nvidia_hpc'
-class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
+class ElbrusCCompiler(ElbrusCompiler, CCompiler):
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
info: 'MachineInfo', exe_wrapper: T.Optional['ExternalProgram'] = None,
linker: T.Optional['DynamicLinker'] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- GnuCCompiler.__init__(self, exelist, version, for_machine, is_cross,
- info, exe_wrapper, defines=defines,
- linker=linker, full_version=full_version)
+ CCompiler.__init__(self, exelist, version, for_machine, is_cross,
+ info, exe_wrapper, linker=linker, full_version=full_version)
ElbrusCompiler.__init__(self)
# It does support some various ISO standards and c/gnu 90, 9x, 1x in addition to those which GNU CC supports.
@@ -356,7 +355,6 @@ class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
extra_args=extra_args,
dependencies=dependencies)
-
class IntelCCompiler(IntelGnuLikeCompiler, CCompiler):
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
info: 'MachineInfo', exe_wrapper: T.Optional['ExternalProgram'] = None,