File tree Expand file tree Collapse file tree 2 files changed +4
-11
lines changed
src/bootstrap/src/core/build_steps Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Original file line number Diff line number Diff line change @@ -1053,10 +1053,6 @@ pub fn rustc_cargo(
10531053
10541054 cargo. rustdocflag ( "-Zcrate-attr=warn(rust_2018_idioms)" ) ;
10551055
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-
10601056 if builder. config . llvm_enzyme {
10611057 cargo. rustflag ( "-l" ) . rustflag ( "Enzyme-19" ) ;
10621058 }
Original file line number Diff line number Diff line change @@ -200,6 +200,10 @@ pub fn prepare_tool_cargo(
200200 cargo. arg ( "--features" ) . arg ( features. join ( ", " ) ) ;
201201 }
202202
203+ // Warning: be very careful with RUSTFLAGS or command-line options, as conditionally applied
204+ // RUSTFLAGS or cli flags can lead to hard-to-diagnose rebuilds due to flag differences, causing
205+ // previous tool build artifacts to get invalidated.
206+
203207 // Enable internal lints for clippy and rustdoc
204208 // NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
205209 // See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
@@ -209,13 +213,6 @@ pub fn prepare_tool_cargo(
209213 // See https://github.com/rust-lang/rust/issues/116538
210214 cargo. rustflag ( "-Zunstable-options" ) ;
211215
212- // `-Zon-broken-pipe=kill` breaks cargo tests
213- if !path. ends_with ( "cargo" ) {
214- // If the output is piped to e.g. `head -n1` we want the process to be killed,
215- // rather than having an error bubble up and cause a panic.
216- cargo. rustflag ( "-Zon-broken-pipe=kill" ) ;
217- }
218-
219216 cargo
220217}
221218
You can’t perform that action at this time.
0 commit comments