Skip to content

Commit

Permalink
Auto merge of #113341 - Kobzol:stage0-sysroot, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Copy stage0 `rustc` binaries to `stage0-sysroot`

This is basically a revival of rust-lang/rust#101711 and rust-lang/rust#107956, with an added check that the full sysroot will only be created if the original rustc comes from `stage0/bin`.

What is/should be tested:

- [x] `rustup toolchain link stage0` (new libstd is used correctly)
- [x]  `python3 x.py fmt dist --stage 0`
- [x] Custom rustc/cargo in `config.toml` (in this case this logic is ignored)
- [x]  Perfbot (try perf run has succeeded)
- [x] Real use case (rust-lang/backtrace-rs#542)

(Hopefully) fixes: rust-lang/rust#101691

This is not the "end all, be all" solution to this problem, but as long as it resolves the basic use-case, and doesn't break perfbot, I say ship it. This code will probably be nuked anyway Soon™ because of the stage redesign.
  • Loading branch information
bors committed Jul 9, 2023
2 parents 6cf0733 + de38254 commit d282f51
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d282f51

Please sign in to comment.