Skip to content

Commit 04f29fd

Browse files
authored
Rollup merge of #145291 - Zalathar:no-warning, r=Kobzol
bootstrap: Only warn about `rust.debug-assertions` if downloading rustc The changes in #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``
2 parents dcc0b6b + e454022 commit 04f29fd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ impl Config {
955955
config.download_rustc_commit =
956956
download_ci_rustc_commit(dwn_ctx, rust_download_rustc, config.llvm_assertions);
957957

958-
if debug_assertions_requested {
958+
if debug_assertions_requested && config.download_rustc_commit.is_some() {
959959
eprintln!(
960960
"WARN: `rust.debug-assertions = true` will prevent downloading CI rustc as alt CI \
961961
rustc is not currently built with debug assertions."

0 commit comments

Comments
 (0)