diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-06-18 18:06:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-18 18:06:54 +0200 |
| commit | ccacb4643dfa3d0f7c97c42a2866641648e0719c (patch) | |
| tree | db29743b7bb0655a1b8abe2d91c58030ac9698dd /src/tools | |
| parent | e6e0826882f4216e9356a94730faada4786e392d (diff) | |
| parent | 48e52bb2000be6b7b406714d3dda14774575c4d5 (diff) | |
| download | rust-ccacb4643dfa3d0f7c97c42a2866641648e0719c.tar.gz rust-ccacb4643dfa3d0f7c97c42a2866641648e0719c.zip | |
Rollup merge of #142672 - Kobzol:bootstrap-tool-clarification, r=jieyouxu
Clarify bootstrap tools description The existence of `stage0-bootstrap-tools` suggests the possiblity of `stage1/N-bootstrap-tools`, but that's not really a thing. Also it doesn't fit the new bootstrap model, where `stageN` essentially means that it was built with a `stageN-1` compiler (except for std). r? ``@jieyouxu``
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/runtest/run_make.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs index a5ce929f9b8..029da1c1898 100644 --- a/src/tools/compiletest/src/runtest/run_make.rs +++ b/src/tools/compiletest/src/runtest/run_make.rs @@ -12,7 +12,7 @@ impl TestCx<'_> { // For `run-make` V2, we need to perform 2 steps to build and run a `run-make` V2 recipe // (`rmake.rs`) to run the actual tests. The support library is already built as a tool rust // library and is available under - // `build/$HOST/stage0-bootstrap-tools/$TARGET/release/librun_make_support.rlib`. + // `build/$HOST/bootstrap-tools/$TARGET/release/librun_make_support.rlib`. // // 1. We need to build the recipe `rmake.rs` as a binary and link in the `run_make_support` // library. @@ -63,7 +63,7 @@ impl TestCx<'_> { // // ``` // build/<target_triple>/ - // ├── stage0-bootstrap-tools/ + // ├── bootstrap-tools/ // │ ├── <host_triple>/release/librun_make_support.rlib // <- support rlib itself // │ ├── <host_triple>/release/deps/ // <- deps // │ └── release/deps/ // <- deps of deps @@ -72,7 +72,7 @@ impl TestCx<'_> { // FIXME(jieyouxu): there almost certainly is a better way to do this (specifically how the // support lib and its deps are organized), but this seems to work for now. - let tools_bin = host_build_root.join("stage0-bootstrap-tools"); + let tools_bin = host_build_root.join("bootstrap-tools"); let support_host_path = tools_bin.join(&self.config.host).join("release"); let support_lib_path = support_host_path.join("librun_make_support.rlib"); |
