Drop conditionally applied cargo -Zon-broken-pipe=kill flags

jieyouxu · jieyouxu · commit 5a7058c5a542 · 2024-09-30T19:09:29.000+08:00
These conditionally applied flags trigger rebuilds because they can
invalidate previous cargo build cache.
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1053,10 +1053,6 @@ pub fn rustc_cargo(
 
     cargo.rustdocflag("-Zcrate-attr=warn(rust_2018_idioms)");
 
-    // If the rustc output is piped to e.g. `head -n1` we want the process to be
-    // killed, rather than having an error bubble up and cause a panic.
-    cargo.rustflag("-Zon-broken-pipe=kill");
-
     if builder.config.llvm_enzyme {
         cargo.rustflag("-l").rustflag("Enzyme-19");
     }
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
@@ -200,6 +200,10 @@ pub fn prepare_tool_cargo(
         cargo.arg("--features").arg(features.join(", "));
     }
 
+    // Warning: be very careful with RUSTFLAGS or command-line options, as conditionally applied
+    // RUSTFLAGS or cli flags can lead to hard-to-diagnose rebuilds due to flag differences, causing
+    // previous tool build artifacts to get invalidated.
+
     // Enable internal lints for clippy and rustdoc
     // NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
     // See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
@@ -209,13 +213,6 @@ pub fn prepare_tool_cargo(
     // See https://github.com/rust-lang/rust/issues/116538
     cargo.rustflag("-Zunstable-options");
 
-    // `-Zon-broken-pipe=kill` breaks cargo tests
-    if !path.ends_with("cargo") {
-        // If the output is piped to e.g. `head -n1` we want the process to be killed,
-        // rather than having an error bubble up and cause a panic.
-        cargo.rustflag("-Zon-broken-pipe=kill");
-    }
-
     cargo
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1053,10 +1053,6 @@ pub fn rustc_cargo(`
`1053`	`1053`
`1054`	`1054`	`cargo.rustdocflag("-Zcrate-attr=warn(rust_2018_idioms)");`
`1055`	`1055`
`1056`		- // If the rustc output is piped to e.g. `head -n1` we want the process to be
`1057`		`- // killed, rather than having an error bubble up and cause a panic.`
`1058`		`- cargo.rustflag("-Zon-broken-pipe=kill");`
`1059`		`-`
`1060`	`1056`	`if builder.config.llvm_enzyme {`
`1061`	`1057`	`cargo.rustflag("-l").rustflag("Enzyme-19");`
`1062`	`1058`	`}`