nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiletest/rmake: cleanup library search paths

Browse Source
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-07-19 09:44:22 +00:00
parent 49ca9ff0ac
commit 9f2a660f86
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/compiletest/src/runtest.rs
View File

@ -3582,14 +3582,15 @@ impl<'test> TestCx<'test> {
};
debug!(?support_lib_deps_deps);
// FIXME(jieyouxu): explain what the hecc we are doing here.
// To compile the recipe with rustc, we need to provide suitable dynamic library search
// paths to rustc. This includes both:
// 1. The "base" dylib search paths that was provided to compiletest, e.g. `LD_LIBRARY_PATH`
// on some linux distros.
// 2. Specific library paths in `self.config.compile_lib_path` needed for running rustc.
// This is the base dynamic library search paths that was made available to compiletest.
let base_dylib_search_paths =
Vec::from_iter(env::split_paths(&env::var(dylib_env_var()).unwrap()));
// We add in `self.config.compile_lib_path` which are the libraries needed to run the
// host compiler.
let host_dylib_search_paths = {
let mut paths = vec![self.config.compile_lib_path.clone()];
paths.extend(base_dylib_search_paths.iter().cloned());