Skip to content

Commit 06f4234

Browse files
committed
Use build-stage consistently
Can't change this in the diagram until I find the sources.
1 parent b7d930b commit 06f4234

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/building/bootstrapping.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,26 @@ So, for example, when you run `x.py test [--stage 1]`,
4141
that means to build the compiler in row 1 and column 0, then run it on the testsuite.
4242
This corresponds to the `run-stage` diagram.
4343
However, when you run `x.py build [--stage 1]`, that means to build the compiler in
44-
row 2 and column 1. This corresponds to the `link-stage` diagram.
44+
row 2 and column 1. This corresponds to the `build-stage` diagram.
4545
Building any of the items in the diagram also requires first building all items with arrows pointing to it.
4646

47-
### What are `run-stage` and `link-stage`?
47+
### What are `run-stage` and `build-stage`?
4848

4949
`run-stage` means that this deals with _running_ the compiler,
5050
so `--stage N` refers to the artifacts in `build/stageN`.
5151

52-
`link-stage` means that this deals with _building_ the compiler,
52+
`build-stage` means that this deals with _building_ the compiler,
5353
and it refers to `build/stageN-component`.
5454

5555
`build/stageN` is suitable for use with `rustup toolchain link`,
5656
but `stageN-component` never has enough components to be usable (since it only has one).
5757
Copying these artifacts from `stage(N-1)-component` to `stageN`
5858
is called _uplifting_ the artifacts to `stageN`.
5959

60-
### Why have `link-stage` at all?
60+
### Why have `build-stage` at all?
6161

6262
`stage0/bin/rustc` can't open an rlib from stage1-* or vice-versa.
63-
They are completely separate worlds, and `link-stage` reflects those worlds quite directly.
63+
They are completely separate worlds, and `build-stage` reflects those worlds quite directly.
6464
Say you want to build a custom driver and you've run
6565
`rustup toolchain link build/*/stage1`: you have to run
6666
`x.py build --stage 1 src/librustc_driver` to have it available.

0 commit comments

Comments
 (0)