diff options
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 16 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index c3c14165aa1..363ce57b0d3 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -886,6 +886,14 @@ impl Step for Cargo { artifact_kind: ToolArtifactKind::Binary, }) } + + fn metadata(&self) -> Option<StepMetadata> { + // FIXME: fix staging logic + Some( + StepMetadata::build("cargo", self.target) + .built_by(self.compiler.with_stage(self.compiler.stage - 1)), + ) + } } /// Represents a built LldWrapper, the `lld-wrapper` tool itself, and a directory @@ -1105,6 +1113,14 @@ impl Step for RustAnalyzer { artifact_kind: ToolArtifactKind::Binary, }) } + + fn metadata(&self) -> Option<StepMetadata> { + // FIXME: fix staging logic + Some( + StepMetadata::build("rust-analyzer", self.target) + .built_by(self.compiler.with_stage(self.compiler.stage - 1)), + ) + } } #[derive(Debug, Clone, Hash, PartialEq, Eq)] diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 1abfba71b9c..73d9d5a6e99 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -1101,6 +1101,8 @@ mod snapshot { [dist] rustc <host> [dist] rustc 1 <host> -> std 1 <host> [dist] src <> + [build] rustc 0 <host> -> cargo 1 <host> + [build] rustc 0 <host> -> rust-analyzer 1 <host> [build] rustc 0 <host> -> rustfmt 1 <host> [build] rustc 0 <host> -> cargo-fmt 1 <host> [build] rustc 0 <host> -> clippy-driver 1 <host> @@ -1291,6 +1293,8 @@ mod snapshot { [dist] rustc <target1> [dist] rustc 1 <host> -> std 1 <target1> [dist] src <> + [build] rustc 0 <host> -> cargo 1 <target1> + [build] rustc 0 <host> -> rust-analyzer 1 <target1> [build] rustc 0 <host> -> rustfmt 1 <target1> [build] rustc 0 <host> -> cargo-fmt 1 <target1> [build] rustc 0 <host> -> clippy-driver 1 <target1> |