Auto merge of #1886 - camelid:stage2, r=RalfJung

Stage 2 seems to be required after all

Reverts most of bb59980b2d.

See the discussion starting at https://github.com/rust-lang/miri/issues/1340#issuecomment-913043714 for more.
This commit is contained in:
bors 2021-09-06 16:22:46 +00:00
commit b97c34020e

View File

@ -148,15 +148,15 @@ cd rustc
./x.py setup compiler ./x.py setup compiler
# Now edit `config.toml` and under `[rust]` set `debug-assertions = true`. # Now edit `config.toml` and under `[rust]` set `debug-assertions = true`.
# Build a stage 1 rustc, and build the rustc libraries with that rustc. # Build a stage 2 rustc, and build the rustc libraries with that rustc.
# This step can take 30 minutes or more. # This step can take 30 minutes or more.
./x.py build --stage 1 compiler/rustc ./x.py build --stage 2 compiler/rustc
# If you change something, you can get a faster rebuild by doing # If you change something, you can get a faster rebuild by doing
./x.py build --keep-stage 0 --stage 1 compiler/rustc ./x.py build --keep-stage 0 --stage 2 compiler/rustc
# You may have to change the architecture in the next command # You may have to change the architecture in the next command
rustup toolchain link stage1 build/x86_64-unknown-linux-gnu/stage1 rustup toolchain link stage2 build/x86_64-unknown-linux-gnu/stage2
# Now cd to your Miri directory, then configure rustup # Now cd to your Miri directory, then configure rustup
rustup override set stage1 rustup override set stage2
``` ```
For more information about building and configuring a local compiler, For more information about building and configuring a local compiler,