aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-09-22 10:54:16 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-10-01 15:05:00 -0700
commite7f0890cb9a26e2e64e79739c80fddb609d484cf (patch)
treee19982b181afbddc39ad61b40c136973968884e0
parent1513aa437dd397934eff176c81d742a78e54ddb9 (diff)
downloadmeson-e7f0890cb9a26e2e64e79739c80fddb609d484cf.zip
meson-e7f0890cb9a26e2e64e79739c80fddb609d484cf.tar.gz
meson-e7f0890cb9a26e2e64e79739c80fddb609d484cf.tar.bz2
compilers: move get_dependency_gen_args to base Compiler
So that every subclass doesn't have to reimplement it. Especially since the Gnu implementation moved out of the CCompiler and into the GnuLikeCompiler mixin
-rw-r--r--mesonbuild/compilers/compilers.py3
-rw-r--r--mesonbuild/compilers/cs.py3
-rw-r--r--mesonbuild/compilers/cuda.py3
-rw-r--r--mesonbuild/compilers/d.py4
-rw-r--r--mesonbuild/compilers/fortran.py3
-rw-r--r--mesonbuild/compilers/java.py3
-rw-r--r--mesonbuild/compilers/mixins/arm.py2
-rw-r--r--mesonbuild/compilers/mixins/c2000.py4
-rw-r--r--mesonbuild/compilers/mixins/ccrx.py4
-rw-r--r--mesonbuild/compilers/mixins/compcert.py4
-rw-r--r--mesonbuild/compilers/mixins/pgi.py3
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py3
-rw-r--r--mesonbuild/compilers/mixins/xc16.py4
13 files changed, 3 insertions, 40 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 578f654..a66ecdc 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1062,6 +1062,9 @@ class Compiler(metaclass=abc.ABCMeta):
def split_shlib_to_parts(self, fname: str) -> T.Tuple[T.Optional[str], str]:
return None, fname
+ def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
+ return []
+
def get_args_from_envvars(lang: str,
for_machine: MachineChoice,
diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py
index b8e673e..01d2adb 100644
--- a/mesonbuild/compilers/cs.py
+++ b/mesonbuild/compilers/cs.py
@@ -61,9 +61,6 @@ class CsCompiler(BasicLinkerIsCompilerMixin, Compiler):
def get_werror_args(self):
return ['-warnaserror']
- def get_dependency_gen_args(self, outtarget, outfile):
- return []
-
def get_linker_exelist(self):
return self.exelist[:]
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index b227ad3..e6b4d04 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -213,9 +213,6 @@ class CudaCompiler(Compiler):
def get_soname_args(self, *args):
return self._cook_link_args(self.host_compiler.get_soname_args(*args))
- def get_dependency_gen_args(self, outtarget, outfile):
- return []
-
def get_compile_only_args(self):
return ['-c']
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index ca7f80d..2be19f7 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -99,10 +99,6 @@ class DmdLikeCompilerMixin:
def get_werror_args(self):
return ['-w']
- def get_dependency_gen_args(self, outtarget, outfile):
- # DMD and LDC does not currently return Makefile-compatible dependency info.
- return []
-
def get_coverage_args(self):
return ['-cov']
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 9c2f5bf..8d17d13 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -108,9 +108,6 @@ class FortranCompiler(CLikeCompiler, Compiler):
def get_debug_args(self, is_debug):
return clike_debug_args[is_debug]
- def get_dependency_gen_args(self, outtarget, outfile):
- return []
-
def get_preprocess_only_args(self):
return ['-cpp'] + super().get_preprocess_only_args()
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py
index e353950..fb4ff7c 100644
--- a/mesonbuild/compilers/java.py
+++ b/mesonbuild/compilers/java.py
@@ -37,9 +37,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
def get_werror_args(self):
return ['-Werror']
- def get_dependency_gen_args(self, outtarget, outfile):
- return []
-
def get_compile_only_args(self):
return []
diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py
index f21e9de..ee7d337 100644
--- a/mesonbuild/compilers/mixins/arm.py
+++ b/mesonbuild/compilers/mixins/arm.py
@@ -96,7 +96,6 @@ class ArmCompiler(Compiler):
def get_always_args(self) -> T.List[str]:
return []
- # Override CCompiler.get_dependency_gen_args
def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
return ['--depend_target', outtarget, '--depend', outfile, '--depend_single_line']
@@ -171,7 +170,6 @@ class ArmclangCompiler(Compiler):
# so it might change semantics at any time.
return ['-include-pch', os.path.join(pch_dir, self.get_pch_name(header))]
- # Override CCompiler.get_dependency_gen_args
def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
return ['-MD', '-MT', outtarget, '-MF', outfile]
diff --git a/mesonbuild/compilers/mixins/c2000.py b/mesonbuild/compilers/mixins/c2000.py
index 34a1cd8..287aaa8 100644
--- a/mesonbuild/compilers/mixins/c2000.py
+++ b/mesonbuild/compilers/mixins/c2000.py
@@ -81,10 +81,6 @@ class C2000Compiler(Compiler):
def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
return []
- # Override CCompiler.get_dependency_gen_args
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def thread_flags(self, env: 'Environment') -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/mixins/ccrx.py b/mesonbuild/compilers/mixins/ccrx.py
index 7e92b35..eba4c45 100644
--- a/mesonbuild/compilers/mixins/ccrx.py
+++ b/mesonbuild/compilers/mixins/ccrx.py
@@ -85,10 +85,6 @@ class CcrxCompiler(Compiler):
def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
return []
- # Override CCompiler.get_dependency_gen_args
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def thread_flags(self, env: 'Environment') -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/mixins/compcert.py b/mesonbuild/compilers/mixins/compcert.py
index 9e8c650..3211f6a 100644
--- a/mesonbuild/compilers/mixins/compcert.py
+++ b/mesonbuild/compilers/mixins/compcert.py
@@ -99,10 +99,6 @@ class CompCertCompiler(Compiler):
patched_args.append(arg)
return patched_args
- # Override CCompiler.get_dependency_gen_args
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def thread_flags(self, env: 'Environment') -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/mixins/pgi.py b/mesonbuild/compilers/mixins/pgi.py
index 6c202ba..61dee8d 100644
--- a/mesonbuild/compilers/mixins/pgi.py
+++ b/mesonbuild/compilers/mixins/pgi.py
@@ -86,9 +86,6 @@ class PGICompiler(Compiler):
parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:]))
return parameter_list
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def get_always_args(self) -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index 77f8dfc..3494bee 100644
--- a/mesonbuild/compilers/mixins/visualstudio.py
+++ b/mesonbuild/compilers/mixins/visualstudio.py
@@ -194,9 +194,6 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
args = [arg for arg in args if arg != '/Gw']
return args
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def linker_to_compiler_args(self, args: T.List[str]) -> T.List[str]:
return ['/link'] + args
diff --git a/mesonbuild/compilers/mixins/xc16.py b/mesonbuild/compilers/mixins/xc16.py
index 1f9f520..77c4690 100644
--- a/mesonbuild/compilers/mixins/xc16.py
+++ b/mesonbuild/compilers/mixins/xc16.py
@@ -84,10 +84,6 @@ class Xc16Compiler(Compiler):
def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
return []
- # Override CCompiler.get_dependency_gen_args
- def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return []
-
def thread_flags(self, env: 'Environment') -> T.List[str]:
return []