Apply -Zon-broken-pipe=kill on bin wrappers

src/bootstrap/src/bin/rustc.rs

@@ -116,6 +116,9 @@ fn main() {
         }
         _ => Command::new(rustc_driver),
     };
+
+    cmd.arg("-Zon-broken-pipe=kill");
+
     cmd.args(&args).env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
 
     if let Some(crate_name) = crate_name {

src/bootstrap/src/bin/rustdoc.rs

@@ -42,6 +42,8 @@ fn main() {
         }
     }
 
+    cmd.arg("-Zon-broken-pipe=kill");
+
     cmd.args(&args);
     cmd.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
 

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");
     }

src/bootstrap/src/core/build_steps/tool.rs

@@ -209,13 +209,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
 }