diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-04-10 12:33:34 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-10 12:33:34 -0700 |
commit | b5e077fce8fe8fd892c76c6c4d474751a680503a (patch) | |
tree | 1024709a67f9d4ce6752a6bd3892d356ad14a8e1 | |
parent | a33f20b9a4e2e0ecf08f251be290bffd0d31a92d (diff) | |
download | meson-b5e077fce8fe8fd892c76c6c4d474751a680503a.zip meson-b5e077fce8fe8fd892c76c6c4d474751a680503a.tar.gz meson-b5e077fce8fe8fd892c76c6c4d474751a680503a.tar.bz2 |
compilers: Move things out of clike
One method belongs in the base Compiler class, the other belongs in
the GnuLikeCompiler class.
-rw-r--r-- | mesonbuild/compilers/compilers.py | 3 | ||||
-rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 6 | ||||
-rw-r--r-- | 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 2caddde..52b9592 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 93c1a7c..cd16f86 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 5072b11..29552f3 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): """ |