aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-12-16 22:50:15 -0500
committerEli Schwartz <eschwartz@archlinux.org>2021-12-30 15:15:25 -0500
commit9f384e92075022af73f1a75bb746b71ea11b2f21 (patch)
treed32fcde29bd80ac4a6b345a7509ab07da6248cd8 /mesonbuild/compilers
parent19c9f32cefdffb7d633eedada2b31059301fb106 (diff)
downloadmeson-9f384e92075022af73f1a75bb746b71ea11b2f21.zip
meson-9f384e92075022af73f1a75bb746b71ea11b2f21.tar.gz
meson-9f384e92075022af73f1a75bb746b71ea11b2f21.tar.bz2
fix type annotations for compiler toolchain rpaths
We pass around a tuple of rpaths, because rpaths *can* be more than one. But all the annotations said it would be a str instead.
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/compilers.py2
-rw-r--r--mesonbuild/compilers/cuda.py2
-rw-r--r--mesonbuild/compilers/d.py2
-rw-r--r--mesonbuild/compilers/mixins/islinker.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index e0745c2..b652f5a 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -875,7 +875,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
return None
def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str,
- rpath_paths: str, build_rpath: str,
+ rpath_paths: T.Tuple[str, ...], build_rpath: str,
install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]:
return self.linker.build_rpath_args(
env, build_dir, from_dir, rpath_paths, build_rpath, install_rpath)
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index 1f396e4..32e75a5 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -706,7 +706,7 @@ class CudaCompiler(Compiler):
return self._to_host_flags(self.host_compiler.get_buildtype_linker_args(buildtype), _Phase.LINKER)
def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str,
- rpath_paths: str, build_rpath: str,
+ rpath_paths: T.Tuple[str, ...], build_rpath: str,
install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]:
(rpath_args, rpath_dirs_to_remove) = self.host_compiler.build_rpath_args(
env, build_dir, from_dir, rpath_paths, build_rpath, install_rpath)
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 4201d82..a83c15b 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -249,7 +249,7 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
return self.linker.import_library_args(implibname)
def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str,
- rpath_paths: str, build_rpath: str,
+ rpath_paths: T.Tuple[str, ...], build_rpath: str,
install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]:
if self.info.is_windows():
return ([], set())
diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py
index 144bc70..9513aa5 100644
--- a/mesonbuild/compilers/mixins/islinker.py
+++ b/mesonbuild/compilers/mixins/islinker.py
@@ -108,7 +108,7 @@ class BasicLinkerIsCompilerMixin(Compiler):
raise MesonException("This linker doesn't support soname args")
def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str,
- rpath_paths: str, build_rpath: str,
+ rpath_paths: T.Tuple[str, ...], build_rpath: str,
install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]:
return ([], set())