diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-11-25 12:05:19 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-12 09:35:32 -0800 |
| commit | 7460e4ccda339d167402bd077dcaa364fab5e172 (patch) | |
| tree | 0926cbc0b7970b4b9de20b6801d6aba51efa712d /mesonbuild/compilers/objcpp.py | |
| parent | ee6e249f659cd4658ae2f1a425d4aa01585c23aa (diff) | |
| download | meson-7460e4ccda339d167402bd077dcaa364fab5e172.tar.gz | |
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/objcpp.py')
| -rw-r--r-- | mesonbuild/compilers/objcpp.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py index ea35a3634..b42cef600 100644 --- a/mesonbuild/compilers/objcpp.py +++ b/mesonbuild/compilers/objcpp.py @@ -35,7 +35,8 @@ class ObjCPPCompiler(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 'Objective-C++' def sanity_check(self, work_dir, environment): |