Skip to content

Commit 49bf3e6

Browse files
committed
Auto merge of #145295 - Kobzol:unify-stages, r=jieyouxu
Consolidate stage directories and group logs in bootstrap My post-stage-0-redesign bootstrap fixes aren't done yet, but I think that enough steps have been migrated to the new system that it makes sense to actually modify the directories on disk, and what gets printed when bootstrap runs, so that it actually corresponds to the new system. Before, the printed stages didn't always make sense. This PR: - Fixes the numbering of `stageN` directories in the build directory. It was not corresponding to the correct stages before; notice that I did not modify `bootstrap/README.md`, as it was essentially describing what happens after this PR (first commit). - Unifies all steps that output a build group to use the `Builder::msg` method. It's probably not the final stage, and some of the test steps might not be fully accurate yet, because I didn't fix test step numbering yet, but I think that it's a clear improvement from before, and now that everything uses the same method, we can easily make changes across the board, to ensure that it stays unified (second commit). r? `@jieyouxu` try-job: dist-x86_64-msvc try-job: dist-x86_64-linux
2 parents 16003b1 + 55a9790 commit 49bf3e6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)