about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-05-07 15:20:22 +0900
committerGitHub <noreply@github.com>2021-05-07 15:20:22 +0900
commit1224e1341a39d3436b3ea00e904e79015041ce12 (patch)
treeedff63ce2474b3772718b9f481daf58fea8ec5c2 /src
parent2d496f46bf1960d72122cccc3ed5c774cea931c2 (diff)
parent3b4b1eab90e6eaed8118ff2eef11fe7ddd9fe555 (diff)
downloadrust-1224e1341a39d3436b3ea00e904e79015041ce12.tar.gz
rust-1224e1341a39d3436b3ea00e904e79015041ce12.zip
Rollup merge of #84781 - jyn514:check-bootstrap, r=Mark-Simulacrum
Don't check bootstrap artifacts by default

Bootstrap has to build successfully or this won't run, so all it checks
are the tests, which are uncommon to change.

Fixes https://github.com/rust-lang/rust/issues/76624.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/check.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 9b76c8b9a2d..8561a2a39b8 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -280,7 +280,7 @@ impl Step for CodegenBackend {
 }
 
 macro_rules! tool_check_step {
-    ($name:ident, $path:literal, $($alias:literal, )* $source_type:path) => {
+    ($name:ident, $path:literal, $($alias:literal, )* $source_type:path $(, $default:literal )?) => {
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub struct $name {
             pub target: TargetSelection,
@@ -289,7 +289,7 @@ macro_rules! tool_check_step {
         impl Step for $name {
             type Output = ();
             const ONLY_HOSTS: bool = true;
-            const DEFAULT: bool = true;
+            const DEFAULT: bool = true $( && $default )?;
 
             fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
                 run.paths(&[ $path, $($alias),* ])
@@ -368,7 +368,7 @@ tool_check_step!(Rustdoc, "src/tools/rustdoc", "src/librustdoc", SourceType::InT
 // rejected.
 tool_check_step!(Clippy, "src/tools/clippy", SourceType::InTree);
 
-tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree);
+tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree, false);
 
 /// Cargo's output path for the standard library in a given stage, compiled
 /// by a particular compiler for the specified target.