Rollup merge of #113948 - chenyukang:yukang-fix-113178-bootstrap, r=clubby789

matthiaskrgr · web-flow · commit 3c83eabdb49b · 2023-07-22T19:57:36.000+02:00
Fix rustc-args passing issue in bootstrap Fixes #113178, r? `@jyn514`
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -2043,6 +2043,13 @@ impl<'a> Builder<'a> {
             rustflags.arg("-Zinline-mir");
         }
 
+        // set rustc args passed from command line
+        let rustc_args =
+            self.config.cmd.rustc_args().iter().map(|s| s.to_string()).collect::<Vec<_>>();
+        if !rustc_args.is_empty() {
+            cargo.env("RUSTFLAGS", &rustc_args.join(" "));
+        }
+
         Cargo { command: cargo, rustflags, rustdocflags, allow_features }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2043,6 +2043,13 @@ impl<'a> Builder<'a> {`
`2043`	`2043`	`rustflags.arg("-Zinline-mir");`
`2044`	`2044`	`}`
`2045`	`2045`
	`2046`	`+ // set rustc args passed from command line`
	`2047`	`+ let rustc_args =`
	`2048`	`+ self.config.cmd.rustc_args().iter().map(\|s\| s.to_string()).collect::<Vec<_>>();`
	`2049`	`+ if !rustc_args.is_empty() {`
	`2050`	`+ cargo.env("RUSTFLAGS", &rustc_args.join(" "));`
	`2051`	`+ }`
	`2052`	`+`
`2046`	`2053`	`Cargo { command: cargo, rustflags, rustdocflags, allow_features }`
`2047`	`2054`	`}`
`2048`	`2055`