diff options
| author | bors <bors@rust-lang.org> | 2022-04-08 05:43:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-08 05:43:25 +0000 |
| commit | dc1f8298ef1abe9cbc648b4d7db620f21f2cec32 (patch) | |
| tree | feb7b9de21a6440bb59406c2e424ae8e17e3adc6 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | e745b4ddbd05026c75aae4506aef39fdfe1603c5 (diff) | |
| parent | 7470592d0ba8a7be88d5d897fe4f0796fdbfa318 (diff) | |
| download | rust-dc1f8298ef1abe9cbc648b4d7db620f21f2cec32.tar.gz rust-dc1f8298ef1abe9cbc648b4d7db620f21f2cec32.zip | |
Auto merge of #95440 - jyn514:error-index, r=Mark-Simulacrum
Fix `x test src/tools/error_index_generator --stage {0,1}`
There were two fixes needed:
1. Use `top_stage` instead of `top_stage - 1`. There was a long and torturous comment about trying to match rustdoc's version, but it works better without the hard-coding than with (before it gave errors that `libtest.so` couldn't be found).
2. Make sure that `ci-llvm/lib` is added to LD_LIBRARY_PATH. Previously the error index would be unable to load LLVM for stage0 builds.
At some point we should probably have a discussion about how rustdoc stages should be numbered;
confusion between 0/1/2 has come up several times in bootstrap now. cc https://github.com/rust-lang/rust/issues/92538
Note that this is still broken when using `download-rustc = true` and `--stage 1`,
but that's *really* a corner case and should affect almost no one. `--stage {0,2}`
work fine with download-rustc.
Fixes https://github.com/rust-lang/rust/issues/80096.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
0 files changed, 0 insertions, 0 deletions