diff options
| author | Dan Kegel <dank@kegel.com> | 2020-05-07 10:15:06 -0700 |
|---|---|---|
| committer | Dan Kegel <dank@kegel.com> | 2020-05-16 20:25:58 +0000 |
| commit | d7235c5905fa98207d90f3ad34bf590493498d5b (patch) | |
| tree | c93233a31beaefd89fdd9c18e4e566c7918a2b1e /mesonbuild/compilers/cuda.py | |
| parent | efb86088bcf8960db440eadcd11c0e073c80ab52 (diff) | |
| download | meson-d7235c5905fa98207d90f3ad34bf590493498d5b.zip meson-d7235c5905fa98207d90f3ad34bf590493498d5b.tar.gz meson-d7235c5905fa98207d90f3ad34bf590493498d5b.tar.bz2 | |
Let .pc files specify rpath.
Fixes #4027
Diffstat (limited to 'mesonbuild/compilers/cuda.py')
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index e839f53..4e89f5d 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -271,9 +271,10 @@ class CudaCompiler(Compiler): 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 |