aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-09-21 10:38:17 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-09-24 12:14:13 -0700
commit2c0fbe161d61d2d15d29892456544442ab1c4ff6 (patch)
tree18eea4af185465640f29727a3761e3b1af5c36fc /mesonbuild/compilers/cpp.py
parent1592b7a800c3b109a1b502bfb03f4e21827da334 (diff)
downloadmeson-2c0fbe161d61d2d15d29892456544442ab1c4ff6.zip
meson-2c0fbe161d61d2d15d29892456544442ab1c4ff6.tar.gz
meson-2c0fbe161d61d2d15d29892456544442ab1c4ff6.tar.bz2
compilers: make is_cross part of the base Compiler class
Every class needs to set this, so it should be part of the base. For classes that require is_cross, the positional argument remains in their signature. For those that don't, they just allow the base class to set their value to it's default of False.
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 3a27e7a..b5dbdda 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -65,8 +65,8 @@ class CPPCompiler(CLikeCompiler, Compiler):
def __init__(self, exelist, version, for_machine: MachineChoice, is_cross: bool,
info: 'MachineInfo', exe_wrap: T.Optional[str] = None, **kwargs):
# If a child ObjCPP class has already set it, don't set it ourselves
- Compiler.__init__(self, exelist, version, for_machine, info, **kwargs)
- CLikeCompiler.__init__(self, is_cross, exe_wrap)
+ Compiler.__init__(self, exelist, version, for_machine, info, is_cross=is_cross, **kwargs)
+ CLikeCompiler.__init__(self, exe_wrap)
@staticmethod
def get_display_language():