mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-04 09:53:04 +03:00
Fix compiletest and rustc-dev-guide
This commit is contained in:
@@ -4,7 +4,7 @@ There are three types of tools you can write in bootstrap:
|
||||
|
||||
- **`Mode::ToolBootstrap`**
|
||||
Use this for tools that don’t need anything from the in-tree compiler and can run with the stage0 `rustc`.
|
||||
The output is placed in the "stage0-bootstrap-tools" directory. This mode is for general-purpose tools built
|
||||
The output is placed in the "bootstrap-tools" directory. This mode is for general-purpose tools built
|
||||
entirely with the stage0 compiler, including target libraries and only works for stage 0.
|
||||
|
||||
- **`Mode::ToolStd`**
|
||||
|
||||
@@ -12,7 +12,7 @@ pub(super) fn run_rmake_test(&self) {
|
||||
// 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 @@ pub(super) fn run_rmake_test(&self) {
|
||||
//
|
||||
// ```
|
||||
// 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 @@ pub(super) fn run_rmake_test(&self) {
|
||||
// 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");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user