Skip to content

Commit 068bcda

Browse files
committed
Use build-stage consistently
Can't change this in the diagram until I find the sources.
1 parent 0c3ec37 commit 068bcda

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
@@ -71,26 +71,26 @@ So, for example, when you run `x.py test [--stage 1]`,
7171
that means to build the compiler in row 1 and column 0, then run it on the testsuite.
7272
This corresponds to the `run-stage` diagram.
7373
However, when you run `x.py build [--stage 1]`, that means to build the compiler in
74-
row 2 and column 1. This corresponds to the `link-stage` diagram.
74+
row 2 and column 1. This corresponds to the `build-stage` diagram.
7575
Building any of the items in the diagram also requires first building all items with arrows pointing to it.
7676

77-
### What are `run-stage` and `link-stage`?
77+
### What are `run-stage` and `build-stage`?
7878

7979
`run-stage` means that this deals with _running_ the compiler,
8080
so `--stage N` refers to the artifacts in `build/stageN`.
8181

82-
`link-stage` means that this deals with _building_ the compiler,
82+
`build-stage` means that this deals with _building_ the compiler,
8383
and it refers to `build/stageN-component`.
8484

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

90-
### Why have `link-stage` at all?
90+
### Why have `build-stage` at all?
9191

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

0 commit comments

Comments
 (0)