diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-08-12 20:37:59 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-12 20:37:59 +1000 |
| commit | 04f29fde1049fc179f306cf1dce3ece85e420723 (patch) | |
| tree | 4fc2855d7306612301a0479aaaad7a690ca6758e | |
| parent | dcc0b6b7b8b975d91ee2799d84f95772035c16a4 (diff) | |
| parent | e4540224229d10a9a537519cad8a64f01060c0ea (diff) | |
| download | rust-04f29fde1049fc179f306cf1dce3ece85e420723.tar.gz rust-04f29fde1049fc179f306cf1dce3ece85e420723.zip | |
Rollup merge of #145291 - Zalathar:no-warning, r=Kobzol
bootstrap: Only warn about `rust.debug-assertions` if downloading rustc The changes in rust-lang/rust#145149 had the unwanted side-effect of causing bootstrap to *always* warn about `rust.debug-assertions = true`, even if rustc isn't going to be downloaded anyway. cc ``@Shourya742`` ``@Kobzol``
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index c505cacadb5..a656927b1f6 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -955,7 +955,7 @@ impl Config { config.download_rustc_commit = download_ci_rustc_commit(dwn_ctx, rust_download_rustc, config.llvm_assertions); - if debug_assertions_requested { + if debug_assertions_requested && config.download_rustc_commit.is_some() { eprintln!( "WARN: `rust.debug-assertions = true` will prevent downloading CI rustc as alt CI \ rustc is not currently built with debug assertions." |