mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #113185 - jyn514:dist-channel, r=ozkanonur

Browse Source 
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:
68d458bb40/src/bootstrap/llvm.rs (L466-L470)
85c4ea0138/src/bootstrap/config.rs (L1374-L1375)
85c4ea0138/src/bootstrap/config.rs (L1464-L1465)
``@cuviper`` i expect you don't want any of those to be set in distro builds, right?
This commit is contained in:
Matthias Krüger 2023-07-01 00:35:05 +02:00 committed by GitHub
commit a2c18616e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/defaults/config.dist.toml
View File

@ -12,6 +12,9 @@ extended = true
[llvm]
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"
download-rustc = false
[dist]