diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-05-02 19:37:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-02 19:37:59 +0200 |
| commit | bfb8f73933e62e14ba3830eada38e23fd1a081ba (patch) | |
| tree | 8789ddd2221295e354d52335ebfbbb6932158659 | |
| parent | 15f21f43b3deb4864468666518220a859e819eef (diff) | |
| parent | 7b25d4a99edc12909dc73c31cb6a44238c4b9bf9 (diff) | |
| download | rust-bfb8f73933e62e14ba3830eada38e23fd1a081ba.tar.gz rust-bfb8f73933e62e14ba3830eada38e23fd1a081ba.zip | |
Rollup merge of #140563 - onur-ozkan:extend-dylib-paths, r=jieyouxu
extend the list of registered dylibs on `test::prepare_cargo_test` self-explanatory Fixes #140299
| -rw-r--r-- | src/bootstrap/src/core/build_steps/test.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index d4fccc535a6..a7a3b5a878c 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -2556,9 +2556,9 @@ fn prepare_cargo_test( // We skip everything on Miri as then this overwrites the libdir set up // by `Cargo::new` and that actually makes things go wrong. if builder.kind != Kind::Miri { - let mut dylib_path = dylib_path(); - dylib_path.insert(0, PathBuf::from(&*builder.sysroot_target_libdir(compiler, target))); - cargo.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap()); + let mut dylib_paths = builder.rustc_lib_paths(compiler); + dylib_paths.push(PathBuf::from(&builder.sysroot_target_libdir(compiler, target))); + helpers::add_dylib_path(dylib_paths, &mut cargo); } if builder.remote_tested(target) { |