aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.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/cpp.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/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 6cbc265..50417ee 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -449,15 +449,14 @@ class NvidiaHPC_CPPCompiler(PGICompiler, CPPCompiler):
self.id = 'nvidia_hpc'
-class ElbrusCPPCompiler(GnuCPPCompiler, ElbrusCompiler):
+class ElbrusCPPCompiler(ElbrusCompiler, CPPCompiler):
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):
- GnuCPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
- info, exe_wrapper, linker=linker,
- full_version=full_version, defines=defines)
+ CPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
+ info, exe_wrapper, linker=linker, full_version=full_version)
ElbrusCompiler.__init__(self)
def get_options(self) -> 'KeyedOptionDictType':