From b5e077fce8fe8fd892c76c6c4d474751a680503a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 10 Apr 2020 12:33:34 -0700 Subject: [PATCH] compilers: Move things out of clike One method belongs in the base Compiler class, the other belongs in the GnuLikeCompiler class. --- mesonbuild/compilers/compilers.py | 3 +++ mesonbuild/compilers/mixins/clike.py | 6 ------ mesonbuild/compilers/mixins/gnu.py | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 2caddded4..52b959200 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1201,6 +1201,9 @@ class Compiler: """ return [] + def get_coverage_link_args(self) -> T.List[str]: + return self.linker.get_coverage_args() + def get_largefile_args(compiler): ''' diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 93c1a7ce6..cd16f86f2 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -114,12 +114,6 @@ class CLikeCompiler: def get_output_args(self, target): return ['-o', target] - def get_coverage_args(self): - return ['--coverage'] - - def get_coverage_link_args(self) -> T.List[str]: - return self.linker.get_coverage_args() - def get_werror_args(self): return ['-Werror'] diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py index 5072b1130..29552f371 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -312,6 +312,9 @@ class GnuLikeCompiler(metaclass=abc.ABCMeta): 'not {}.'.format(linker)) return ['-fuse-ld={}'.format(linker)] + def get_coverage_args(self) -> T.List[str]: + return ['--coverage'] + class GnuCompiler(GnuLikeCompiler): """