mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #115598 - GoldsteinE:fix-bootstrap-formatting, r=onur-ozkan

Browse Source 
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()`)
This commit is contained in:
Matthias Krüger 2023-09-06 19:31:51 +02:00 committed by GitHub
commit 23537ce47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/lib.rs
View File

@ -1019,7 +1019,7 @@ impl Build {
fn info(&self, msg: &str) { fn info(&self, msg: &str) {
match self.config.dry_run { match self.config.dry_run {
DryRun::SelfCheck => return, DryRun::SelfCheck => (),
DryRun::Disabled | DryRun::UserSelected => { DryRun::Disabled | DryRun::UserSelected => {
println!("{msg}"); println!("{msg}");
} }

4
src/bootstrap/llvm.rs
View File

@ -598,9 +598,9 @@ fn configure_cmake(
} else if target.contains("linux") { } else if target.contains("linux") {
cfg.define("CMAKE_SYSTEM_NAME", "Linux"); cfg.define("CMAKE_SYSTEM_NAME", "Linux");
} else { } else {
builder.info( builder.info(&format!(
"could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail", "could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail",
); ));
} }
// When cross-compiling we should also set CMAKE_SYSTEM_VERSION, but in // When cross-compiling we should also set CMAKE_SYSTEM_VERSION, but in