Skip to content

Commit a2c1861

Browse files
authored
Rollup merge of #113185 - jyn514:dist-channel, r=ozkanonur
Set `channel = nightly` in dist profile This avoids some channel-specific defaults leaking into local installs. It also makes it easier to set options for compiler/library/codegen profiles in the future, since they can be gated off `channel` instead of being duplicated between all three files. Here are the exact things `channel` controls today: https://github.com/rust-lang/rust/blob/68d458bb402b873b9ae80423710c2672967479df/src/bootstrap/llvm.rs#L466-L470 https://github.com/rust-lang/rust/blob/85c4ea0138fcca2e8cf4515a063cd3b762d64aec/src/bootstrap/config.rs#L1374-L1375 https://github.com/rust-lang/rust/blob/85c4ea0138fcca2e8cf4515a063cd3b762d64aec/src/bootstrap/config.rs#L1464-L1465 ``@cuviper`` i expect you don't want any of those to be set in distro builds, right?
2 parents 709f184 + 368f517 commit a2c1861

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/bootstrap/defaults/config.dist.toml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ extended = true
1212
[llvm]
1313
download-ci-llvm = false
1414
[rust]
15+
# We have several defaults in bootstrap that depend on whether the channel is `dev` (e.g. `omit-git-hash` and `download-ci-llvm`).
16+
# Make sure they don't get set when installing from source.
17+
channel = "nightly"
1518
download-rustc = false
1619

1720
[dist]

0 commit comments

Comments
 (0)