Skip to content

Commit 48e52bb

Browse files
committed
Fix compiletest and rustc-dev-guide
1 parent 6be97a0 commit 48e52bb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/doc/rustc-dev-guide/src/building/bootstrapping/writing-tools-in-bootstrap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ There are three types of tools you can write in bootstrap:
44

55
- **`Mode::ToolBootstrap`**
66
Use this for tools that don’t need anything from the in-tree compiler and can run with the stage0 `rustc`.
7-
The output is placed in the "stage0-bootstrap-tools" directory. This mode is for general-purpose tools built
7+
The output is placed in the "bootstrap-tools" directory. This mode is for general-purpose tools built
88
entirely with the stage0 compiler, including target libraries and only works for stage 0.
99

1010
- **`Mode::ToolStd`**

src/tools/compiletest/src/runtest/run_make.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ impl TestCx<'_> {
1212
// For `run-make` V2, we need to perform 2 steps to build and run a `run-make` V2 recipe
1313
// (`rmake.rs`) to run the actual tests. The support library is already built as a tool rust
1414
// library and is available under
15-
// `build/$HOST/stage0-bootstrap-tools/$TARGET/release/librun_make_support.rlib`.
15+
// `build/$HOST/bootstrap-tools/$TARGET/release/librun_make_support.rlib`.
1616
//
1717
// 1. We need to build the recipe `rmake.rs` as a binary and link in the `run_make_support`
1818
// library.
@@ -63,7 +63,7 @@ impl TestCx<'_> {
6363
//
6464
// ```
6565
// build/<target_triple>/
66-
// ├── stage0-bootstrap-tools/
66+
// ├── bootstrap-tools/
6767
// │ ├── <host_triple>/release/librun_make_support.rlib // <- support rlib itself
6868
// │ ├── <host_triple>/release/deps/ // <- deps
6969
// │ └── release/deps/ // <- deps of deps
@@ -72,7 +72,7 @@ impl TestCx<'_> {
7272
// FIXME(jieyouxu): there almost certainly is a better way to do this (specifically how the
7373
// support lib and its deps are organized), but this seems to work for now.
7474

75-
let tools_bin = host_build_root.join("stage0-bootstrap-tools");
75+
let tools_bin = host_build_root.join("bootstrap-tools");
7676
let support_host_path = tools_bin.join(&self.config.host).join("release");
7777
let support_lib_path = support_host_path.join("librun_make_support.rlib");
7878

0 commit comments

Comments
 (0)