diff options
| author | bors <bors@rust-lang.org> | 2021-05-01 23:16:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-01 23:16:12 +0000 |
| commit | 7e717e99be6d3418d44ec510e142484db12fd757 (patch) | |
| tree | e28cf39b8361ded5773d3618e06cbd042502aaaf | |
| parent | 4de75720970a223b125a811d3662fd15a08d4d18 (diff) | |
| parent | 7d4c3889d4e11bdc2e204be2fd4f7c136f8c0f1a (diff) | |
| download | rust-7e717e99be6d3418d44ec510e142484db12fd757.tar.gz rust-7e717e99be6d3418d44ec510e142484db12fd757.zip | |
Auto merge of #84471 - jyn514:linkcheck-llvm, r=Mark-Simulacrum
Allow running `x.py test --stage 2 src/tools/linkchecker` with `download-rustc = true` Previously, the LD_LIBRARY_PATH for the linkchecker looked like `build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/lib`, because the linkchecker depends on the master copy of the standard library. This is true, but doesn't include the library path for the compiler libraries: ``` /home/joshua/src/rust/rust/build/x86_64-unknown-linux-gnu/stage1-tools-bin/error_index_generator: error while loading shared libraries: libLLVM-12-rust-1.53.0-nightly.so: cannot open shared object file: No such file or directory ``` That file is in `build/x86_64-unknown-linux-gnu/stage1/lib/libLLVM-12-rust-1.53.0-nightly.so`, which wasn't included in the dynamic path. This adds `build/x86_64-unknown-linux-gnu/stage1/lib` to the dynamic path for the linkchecker.
| -rw-r--r-- | src/bootstrap/tool.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index e85f4628fb0..4f2426648fd 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -392,7 +392,10 @@ impl ErrorIndex { let compiler = builder.compiler(builder.top_stage.saturating_sub(1), builder.config.build); let mut cmd = Command::new(builder.ensure(ErrorIndex { compiler })); add_dylib_path( - vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))], + vec![ + PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host)), + PathBuf::from(builder.rustc_libdir(compiler)), + ], &mut cmd, ); cmd |