aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2023-07-12 17:56:18 -0500
committerTristan Partin <tristan@partin.io>2023-07-12 18:56:06 -0500
commit33c8362a1cdd57dd60c7be8fdf3b0566ccdeb3bf (patch)
tree441f9e319ee99b27bc1c051e204923cf57488892 /mesonbuild/compilers
parentdc692d98fc48f8d5c6ea528adc6dce481412b02f (diff)
downloadmeson-33c8362a1cdd57dd60c7be8fdf3b0566ccdeb3bf.zip
meson-33c8362a1cdd57dd60c7be8fdf3b0566ccdeb3bf.tar.gz
meson-33c8362a1cdd57dd60c7be8fdf3b0566ccdeb3bf.tar.bz2
Match the method signatures of parent classes
Names and types of some methods did not match their parent methods.
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/cpp.py4
-rw-r--r--mesonbuild/compilers/mixins/gnu.py4
-rw-r--r--mesonbuild/compilers/mixins/intel.py4
-rw-r--r--mesonbuild/compilers/mixins/metrowerks.py4
-rw-r--r--mesonbuild/compilers/mixins/ti.py4
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py14
-rw-r--r--mesonbuild/compilers/vala.py4
7 files changed, 19 insertions, 19 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index be5c083..bb1ebb5 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -867,8 +867,8 @@ class CcrxCPPCompiler(CcrxCompiler, CPPCompiler):
def get_compile_only_args(self) -> T.List[str]:
return []
- def get_output_args(self, target: str) -> T.List[str]:
- return [f'-output=obj={target}']
+ def get_output_args(self, outputname: str) -> T.List[str]:
+ return [f'-output=obj={outputname}']
def get_option_link_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
index 7b7bc89..2b18732 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -529,8 +529,8 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
args.append('-fno-omit-frame-pointer')
return args
- def get_output_args(self, target: str) -> T.List[str]:
- return ['-o', target]
+ def get_output_args(self, outputname: str) -> T.List[str]:
+ return ['-o', outputname]
def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
return ['-MD', '-MQ', outtarget, '-MF', outfile]
diff --git a/mesonbuild/compilers/mixins/intel.py b/mesonbuild/compilers/mixins/intel.py
index 711e77c..9af05e0 100644
--- a/mesonbuild/compilers/mixins/intel.py
+++ b/mesonbuild/compilers/mixins/intel.py
@@ -89,8 +89,8 @@ class IntelGnuLikeCompiler(GnuLikeCompiler):
return ['-pch', '-pch_dir', os.path.join(pch_dir), '-x',
self.lang_header, '-include', header, '-x', 'none']
- def get_pch_name(self, header_name: str) -> str:
- return os.path.basename(header_name) + '.' + self.get_pch_suffix()
+ def get_pch_name(self, name: str) -> str:
+ return os.path.basename(name) + '.' + self.get_pch_suffix()
def openmp_flags(self) -> T.List[str]:
if mesonlib.version_compare(self.version, '>=15.0.0'):
diff --git a/mesonbuild/compilers/mixins/metrowerks.py b/mesonbuild/compilers/mixins/metrowerks.py
index 7aab9b5..83a1c1d 100644
--- a/mesonbuild/compilers/mixins/metrowerks.py
+++ b/mesonbuild/compilers/mixins/metrowerks.py
@@ -249,8 +249,8 @@ class MetrowerksCompiler(Compiler):
def get_optimization_args(self, optimization_level: str) -> T.List[str]:
return mwcc_optimization_args[optimization_level]
- def get_output_args(self, target: str) -> T.List[str]:
- return ['-o', target]
+ def get_output_args(self, outputname: str) -> T.List[str]:
+ return ['-o', outputname]
def get_pic_args(self) -> T.List[str]:
return ['-pic']
diff --git a/mesonbuild/compilers/mixins/ti.py b/mesonbuild/compilers/mixins/ti.py
index 6123aea..ae23c84 100644
--- a/mesonbuild/compilers/mixins/ti.py
+++ b/mesonbuild/compilers/mixins/ti.py
@@ -113,8 +113,8 @@ class TICompiler(Compiler):
def get_no_optimization_args(self) -> T.List[str]:
return ['-Ooff']
- def get_output_args(self, target: str) -> T.List[str]:
- return [f'--output_file={target}']
+ def get_output_args(self, outputname: str) -> T.List[str]:
+ return [f'--output_file={outputname}']
def get_werror_args(self) -> T.List[str]:
return ['--emit_warnings_as_errors']
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index 54a95bb..24f1132 100644
--- a/mesonbuild/compilers/mixins/visualstudio.py
+++ b/mesonbuild/compilers/mixins/visualstudio.py
@@ -147,8 +147,8 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
def get_pch_suffix(self) -> str:
return 'pch'
- def get_pch_name(self, header: str) -> str:
- chopped = os.path.basename(header).split('.')[:-1]
+ def get_pch_name(self, name: str) -> str:
+ chopped = os.path.basename(name).split('.')[:-1]
chopped.append(self.get_pch_suffix())
pchname = '.'.join(chopped)
return pchname
@@ -181,12 +181,12 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
raise mesonlib.MesonException('VS only supports address sanitizer at the moment.')
return ['/fsanitize=address']
- def get_output_args(self, target: str) -> T.List[str]:
+ def get_output_args(self, outputname: str) -> T.List[str]:
if self.mode == CompileCheckMode.PREPROCESS:
- return ['/Fi' + target]
- if target.endswith('.exe'):
- return ['/Fe' + target]
- return ['/Fo' + target]
+ return ['/Fi' + outputname]
+ if outputname.endswith('.exe'):
+ return ['/Fe' + outputname]
+ return ['/Fo' + outputname]
def get_buildtype_args(self, buildtype: str) -> T.List[str]:
return []
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index e1477b9..c6af04a 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -46,7 +46,7 @@ class ValaCompiler(Compiler):
def get_debug_args(self, is_debug: bool) -> T.List[str]:
return ['--debug'] if is_debug else []
- def get_output_args(self, target: str) -> T.List[str]:
+ def get_output_args(self, outputname: str) -> T.List[str]:
return [] # Because compiles into C.
def get_compile_only_args(self) -> T.List[str]:
@@ -64,7 +64,7 @@ class ValaCompiler(Compiler):
def get_always_args(self) -> T.List[str]:
return ['-C']
- def get_warn_args(self, warning_level: str) -> T.List[str]:
+ def get_warn_args(self, level: str) -> T.List[str]:
return []
def get_no_warn_args(self) -> T.List[str]: