diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2025-05-01 10:19:46 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-08-01 15:54:21 +0300 |
| commit | 8cccad4f8b4e41a48e59fdbd8e3a18042e1245f8 (patch) | |
| tree | 049adc3ba5114eb1300f94a592a98b0cb52068e1 /mesonbuild/compilers/rust.py | |
| parent | c554ca55e7493921728645bd082565604f7e17db (diff) | |
| download | meson-8cccad4f8b4e41a48e59fdbd8e3a18042e1245f8.tar.gz | |
call determine_rpath_dirs only when linker requires it
Diffstat (limited to 'mesonbuild/compilers/rust.py')
| -rw-r--r-- | mesonbuild/compilers/rust.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index aef88eb45..bc2777990 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -197,13 +197,10 @@ class RustCompiler(Compiler): def get_optimization_args(self, optimization_level: str) -> T.List[str]: return rust_optimization_args[optimization_level] - def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str, - rpath_paths: T.Tuple[str, ...], build_rpath: str, - install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]: + def build_rpath_args(self, env: Environment, build_dir: str, from_dir: str, + target: BuildTarget, extra_paths: T.Optional[T.List[str]] = None) -> T.Tuple[T.List[str], T.Set[bytes]]: # add rustc's sysroot to account for rustup installations - args, to_remove = self.linker.build_rpath_args(env, build_dir, from_dir, rpath_paths, - build_rpath, install_rpath, - [self.get_target_libdir()]) + args, to_remove = super().build_rpath_args(env, build_dir, from_dir, target, [self.get_target_libdir()]) rustc_rpath_args = [] for arg in args: |
