Skip to content

Commit e779ebe

Browse files
authored
Unrolled build for rust-lang#123189
Rollup merge of rust-lang#123189 - Kobzol:rustc-shim-log, r=onur-ozkan Log BOLT args in bootstrap `rustc` shim Before, the BOLT argument would not be logged, because it was only added after the logging has happened. Found by `@RalfJung` [here](rust-lang#116352 (comment)).
2 parents 688c30d + a4087b7 commit e779ebe

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/bootstrap/src/bin/rustc.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,12 @@ fn main() {
220220
}
221221
}
222222

223+
if env::var_os("RUSTC_BOLT_LINK_FLAGS").is_some() {
224+
if let Some("rustc_driver") = crate_name {
225+
cmd.arg("-Clink-args=-Wl,-q");
226+
}
227+
}
228+
223229
let is_test = args.iter().any(|a| a == "--test");
224230
if verbose > 2 {
225231
let rust_env_vars =
@@ -244,12 +250,6 @@ fn main() {
244250
eprintln!("{prefix} libdir: {libdir:?}");
245251
}
246252

247-
if env::var_os("RUSTC_BOLT_LINK_FLAGS").is_some() {
248-
if let Some("rustc_driver") = crate_name {
249-
cmd.arg("-Clink-args=-Wl,-q");
250-
}
251-
}
252-
253253
bin_helpers::maybe_dump(format!("stage{stage}-rustc"), &cmd);
254254

255255
let start = Instant::now();

0 commit comments

Comments
 (0)