Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum

1 files changed, 4 insertions, 6 deletions

diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index 00233b069..b109572cc 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -268,17 +268,15 @@ class CudaCompiler(Compiler):
     def get_depfile_suffix(self):
         return 'd'
 
-    def get_linker_debug_crt_args(self) -> T.List[str]:
-        return self._cook_link_args(self.host_compiler.get_linker_debug_crt_args())
-
     def get_buildtype_linker_args(self, buildtype):
         return self._cook_link_args(self.host_compiler.get_buildtype_linker_args(buildtype))
 
     def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str,
                          rpath_paths: str, build_rpath: str,
-                         install_rpath: str) -> T.List[str]:
-        return self._cook_link_args(self.host_compiler.build_rpath_args(
-            env, build_dir, from_dir, rpath_paths, build_rpath, install_rpath))
+                         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)
+        return (self._cook_link_args(rpath_args), rpath_dirs_to_remove)
 
     def linker_to_compiler_args(self, args):
         return args