diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-09-06 19:31:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 19:31:51 +0200 |
| commit | 23537ce47e404e9a3128afe709d12d2aed1382fd (patch) | |
| tree | f079b8418df35b70226dce667d2a4a1df386f1cb | |
| parent | da44234b647115d9056622ef786fe875d1bb684d (diff) | |
| parent | e0593f30fbaf8fdc05784ee90833596b2d659d9c (diff) | |
| download | rust-23537ce47e404e9a3128afe709d12d2aed1382fd.tar.gz rust-23537ce47e404e9a3128afe709d12d2aed1382fd.zip | |
Rollup merge of #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()`)
| -rw-r--r-- | src/bootstrap/lib.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/llvm.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 4396bbc51a3..671d25484d0 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1019,7 +1019,7 @@ impl Build { fn info(&self, msg: &str) { match self.config.dry_run { - DryRun::SelfCheck => return, + DryRun::SelfCheck => (), DryRun::Disabled | DryRun::UserSelected => { println!("{msg}"); } diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs index 07502e0e9dd..aefed501513 100644 --- a/src/bootstrap/llvm.rs +++ b/src/bootstrap/llvm.rs @@ -598,9 +598,9 @@ fn configure_cmake( } else if target.contains("linux") { cfg.define("CMAKE_SYSTEM_NAME", "Linux"); } else { - builder.info( + builder.info(&format!( "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 |