Skip to content

Commit 72b606d

Browse files
committed
Replace stage0-tools-bin with stage1-tools-bin
1 parent f7defc0 commit 72b606d

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/bootstrap/src/core/builder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ You have to build a stage1 compiler for `{}` first, and then use it to build a s
15971597
cmd.env("CARGO", &self.initial_cargo);
15981598
// Need to add the `run_compiler` libs. Those are the libs produces *by* `build_compiler`
15991599
// in `tool::ToolBuild` step, so they match the Miri we just built. However this means they
1600-
// are actually living one stage up, i.e. we are running `stage0-tools-bin/miri` with the
1600+
// are actually living one stage up, i.e. we are running `stage1-tools-bin/miri` with the
16011601
// libraries in `stage1/lib`. This is an unfortunate off-by-1 caused (possibly) by the fact
16021602
// that Miri doesn't have an "assemble" step like rustc does that would cross the stage boundary.
16031603
// We can't use `add_rustc_lib_path` as that's a NOP on Windows but we do need these libraries

src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ ENV RUST_CONFIGURE_ARGS \
9696
--set rust.codegen-units=1
9797

9898
ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
99-
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
99+
./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
100100
--host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap
101101

102102
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=clang

src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eux
44

55
python3 ../x.py build --set rust.debug=true opt-dist
66

7-
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
7+
./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
88
--host $HOSTS --target $HOSTS \
99
--include-default-paths \
1010
build-manifest bootstrap

src/ci/github-actions/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ auto:
656656
--enable-full-tools
657657
--enable-profiler
658658
--set rust.codegen-units=1
659-
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
659+
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage1-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
660660
DIST_REQUIRE_ALL_TOOLS: 1
661661
CODEGEN_BACKENDS: llvm,cranelift
662662
<<: *job-windows-8c

src/doc/rustc-dev-guide/src/building/optimized-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Here is an example of how can `opt-dist` be used locally (outside of CI):
118118
```
119119
3. Run the tool with the `local` mode and provide necessary parameters:
120120
```bash
121-
./build/host/stage0-tools-bin/opt-dist local \
121+
./build/host/stage1-tools-bin/opt-dist local \
122122
--target-triple <target> \ # select target, e.g. "x86_64-unknown-linux-gnu"
123123
--checkout-dir <path> \ # path to rust checkout, e.g. "."
124124
--llvm-dir <path> \ # path to built LLVM toolchain, e.g. "/foo/bar/llvm/install"

0 commit comments

Comments
 (0)