Skip to content

Commit 30518e3

Browse files
authored
Minor updates to stage docs. (#781)
1 parent 7a42bf2 commit 30518e3

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

src/building/bootstrapping.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ The following tables indicate the outputs of various stage actions:
128128
|-----------------------------------------------------------|----------------------------------------------|
129129
| `beta` extracted | `build/HOST/stage0` |
130130
| `stage0` builds `bootstrap` | `build/bootstrap` |
131-
| `stage0` builds `libstd` | `build/HOST/stage0-std/TARGET` |
131+
| `stage0` builds `libtest`/`libstd` | `build/HOST/stage0-std/TARGET` |
132132
| copy `stage0-std` (HOST only) | `build/HOST/stage0-sysroot/lib/rustlib/HOST` |
133133
| `stage0` builds `rustc` with `stage0-sysroot` | `build/HOST/stage0-rustc/HOST` |
134134
| copy `stage0-rustc (except executable)` | `build/HOST/stage0-sysroot/lib/rustlib/HOST` |
@@ -143,22 +143,22 @@ The following tables indicate the outputs of various stage actions:
143143
| copy (uplift) `stage0-rustc` executable to `stage1` | `build/HOST/stage1/bin` |
144144
| copy (uplift) `stage0-codegen` to `stage1` | `build/HOST/stage1/lib` |
145145
| copy (uplift) `stage0-sysroot` to `stage1` | `build/HOST/stage1/lib` |
146-
| `stage1` builds `libstd` | `build/HOST/stage1-std/TARGET` |
146+
| `stage1` builds `libtest`/`libstd` | `build/HOST/stage1-std/TARGET` |
147147
| copy `stage1-std` (HOST only) | `build/HOST/stage1/lib/rustlib/HOST` |
148148
| `stage1` builds `rustc` | `build/HOST/stage1-rustc/HOST` |
149149
| copy `stage1-rustc` (except executable) | `build/HOST/stage1/lib/rustlib/HOST` |
150150
| `stage1` builds `codegen` | `build/HOST/stage1-codegen/HOST` |
151151

152152
`--stage=1` stops here.
153153

154-
| Stage 2 Action | Output |
155-
|-------------------------------------------|-----------------------------------------------------------------|
156-
| copy (uplift) `stage1-rustc` executable | `build/HOST/stage2/bin` |
157-
| copy (uplift) `stage1-sysroot` | `build/HOST/stage2/lib and build/HOST/stage2/lib/rustlib/HOST` |
158-
| `stage2` builds `libstd` (except HOST?) | `build/HOST/stage2-std/TARGET` |
159-
| copy `stage2-std` (not HOST targets) | `build/HOST/stage2/lib/rustlib/TARGET` |
160-
| `stage2` builds `rustdoc` | `build/HOST/stage2-tools/HOST` |
161-
| copy `rustdoc` | `build/HOST/stage2/bin` |
154+
| Stage 2 Action | Output |
155+
|--------------------------------------------------------|-----------------------------------------------------------------|
156+
| copy (uplift) `stage1-rustc` executable | `build/HOST/stage2/bin` |
157+
| copy (uplift) `stage1-sysroot` | `build/HOST/stage2/lib and build/HOST/stage2/lib/rustlib/HOST` |
158+
| `stage2` builds `libtest`/`libstd` (not HOST targets) | `build/HOST/stage2-std/TARGET` |
159+
| copy `stage2-std` (not HOST targets) | `build/HOST/stage2/lib/rustlib/TARGET` |
160+
| `stage2` builds `rustdoc` | `build/HOST/stage2-tools/HOST` |
161+
| copy `rustdoc` | `build/HOST/stage2/bin` |
162162

163163
`--stage=2` stops here.
164164

src/building/how-to-build-and-run.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ The result is that compiling `rustc` is done in stages:
9595
particular, the stage1 compiler itself was built by stage0 and
9696
hence not by the source in your working directory: this means that
9797
the symbol names used in the compiler source may not match the
98-
symbol names that would have been made by the stage1 compiler.
99-
This can be important when using dynamic linking (e.g., with
100-
derives). Sometimes this means that some tests don't work when run
101-
with stage1.
98+
symbol names that would have been made by the stage1 compiler. This is
99+
important when using dynamic linking and the lack of ABI compatibility
100+
between versions. This primarily manifests when tests try to link with any
101+
of the `rustc_*` crates or use the (now deprecated) plugin infrastructure.
102+
These tests are marked with `ignore-stage1`.
102103
- **Stage 2:** we rebuild our stage1 compiler with itself to produce
103104
the stage2 compiler (i.e. it builds itself) to have all the _latest
104105
optimizations_. (By default, we copy the stage1 libraries for use by

src/img/rustc_stages.svg

+2-1
Loading

0 commit comments

Comments
 (0)