From 9847c738930b329f70e34d97048a35cd795654b8 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Wed, 9 Apr 2025 09:54:45 +0300
Subject: [PATCH 1/2] set `rust.channel` to "auto-detect" for `dist` profile
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/defaults/bootstrap.dist.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootstrap/defaults/bootstrap.dist.toml b/src/bootstrap/defaults/bootstrap.dist.toml
index 7b381b416ca8a..6221e2e01e4c4 100644
--- a/src/bootstrap/defaults/bootstrap.dist.toml
+++ b/src/bootstrap/defaults/bootstrap.dist.toml
@@ -15,7 +15,7 @@ download-ci-llvm = false
[rust]
# We have several defaults in bootstrap that depend on whether the channel is `dev` (e.g. `omit-git-hash` and `download-ci-llvm`).
# Make sure they don't get set when installing from source.
-channel = "nightly"
+channel = "auto-detect"
# Never download a rustc, distributions must build a fresh compiler.
download-rustc = false
lld = true
From b1053fdb76cca8b2006558207b3b1c939c3df333 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Wed, 9 Apr 2025 09:45:56 +0300
Subject: [PATCH 2/2] handle `config.channel` default for tarballs
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/config/config.rs | 33 ++++++++++++++-----------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 1712be7f947fa..9532cfa711f4f 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1540,9 +1540,6 @@ impl Config {
}
}
- let file_content = t!(fs::read_to_string(config.src.join("src/ci/channel")));
- let ci_channel = file_content.trim_end();
-
// Give a hard error if `--config` or `RUST_BOOTSTRAP_CONFIG` are set to a missing path,
// but not if `bootstrap.toml` hasn't been created.
let mut toml = if !using_default_path || toml_path.exists() {
@@ -1847,17 +1844,21 @@ impl Config {
let mut lld_enabled = None;
let mut std_features = None;
- let is_user_configured_rust_channel =
- if let Some(channel) = toml.rust.as_ref().and_then(|r| r.channel.clone()) {
- if channel == "auto-detect" {
- config.channel = ci_channel.into();
- } else {
- config.channel = channel;
- }
+ let file_content = t!(fs::read_to_string(config.src.join("src/ci/channel")));
+ let ci_channel = file_content.trim_end();
+
+ let toml_channel = toml.rust.as_ref().and_then(|r| r.channel.clone());
+ let is_user_configured_rust_channel = match toml_channel {
+ Some(channel) if channel == "auto-detect" => {
+ config.channel = ci_channel.into();
true
- } else {
- false
- };
+ }
+ Some(channel) => {
+ config.channel = channel;
+ true
+ }
+ None => false,
+ };
let default = config.channel == "dev";
config.omit_git_hash = toml.rust.as_ref().and_then(|r| r.omit_git_hash).unwrap_or(default);
@@ -1882,6 +1883,10 @@ impl Config {
&& config.src.join(".cargo/config.toml").exists(),
);
+ if !is_user_configured_rust_channel && config.rust_info.is_from_tarball() {
+ config.channel = ci_channel.into();
+ }
+
if let Some(rust) = toml.rust {
let Rust {
optimize: optimize_toml,
@@ -2085,8 +2090,6 @@ impl Config {
config.channel = channel;
}
- } else if config.rust_info.is_from_tarball() && !is_user_configured_rust_channel {
- ci_channel.clone_into(&mut config.channel);
}
if let Some(llvm) = toml.llvm {