Skip to content

Commit 33602e3

Browse files
authored
Rollup merge of rust-lang#115598 - GoldsteinE:fix-bootstrap-formatting, r=onur-ozkan
Fix log formatting in bootstrap `format!()` was missing, so log was just showing `{target}` verbatim. (I also applied a small clippy suggestion in `builder.info()`)
2 parents 67f68a1 + e0593f3 commit 33602e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/bootstrap/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ impl Build {
10191019

10201020
fn info(&self, msg: &str) {
10211021
match self.config.dry_run {
1022-
DryRun::SelfCheck => return,
1022+
DryRun::SelfCheck => (),
10231023
DryRun::Disabled | DryRun::UserSelected => {
10241024
println!("{msg}");
10251025
}

src/bootstrap/llvm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -598,9 +598,9 @@ fn configure_cmake(
598598
} else if target.contains("linux") {
599599
cfg.define("CMAKE_SYSTEM_NAME", "Linux");
600600
} else {
601-
builder.info(
601+
builder.info(&format!(
602602
"could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail",
603-
);
603+
));
604604
}
605605

606606
// When cross-compiling we should also set CMAKE_SYSTEM_VERSION, but in

0 commit comments

Comments
 (0)