aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-11-25 12:05:19 -0800
committerDylan Baker <dylan@pnwbakers.com>2019-12-12 09:35:32 -0800
commit7460e4ccda339d167402bd077dcaa364fab5e172 (patch)
tree0926cbc0b7970b4b9de20b6801d6aba51efa712d /mesonbuild/compilers/cpp.py
parentee6e249f659cd4658ae2f1a425d4aa01585c23aa (diff)
downloadmeson-7460e4ccda339d167402bd077dcaa364fab5e172.zip
meson-7460e4ccda339d167402bd077dcaa364fab5e172.tar.gz
meson-7460e4ccda339d167402bd077dcaa364fab5e172.tar.bz2
compilers: Make get_display_language a class or static method
Currently this is done at the instance level, but we need it at the class level to allow compiler "lang" args to be gotten early enough. This patch also removes a couple of instance of branch/leaf classes providing their own implementation that is identical to the Compiler version.
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 0cf77ab..a2dd60f 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -67,7 +67,8 @@ class CPPCompiler(CLikeCompiler, Compiler):
Compiler.__init__(self, exelist, version, for_machine, info, **kwargs)
CLikeCompiler.__init__(self, is_cross, exe_wrap)
- def get_display_language(self):
+ @staticmethod
+ def get_display_language():
return 'C++'
def get_no_stdinc_args(self):