diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-01 00:35:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 00:35:05 +0200 |
| commit | a2c18616e303b805aa81e6c8e58a4cdef10ea7e5 (patch) | |
| tree | da43183bc86e872c9ea99a844e0f846569fa1792 | |
| parent | 709f184593c6427e51d4e977647c106255553695 (diff) | |
| parent | 368f51743b8c6e4e3332394d2c077f1d30764bc9 (diff) | |
| download | rust-a2c18616e303b805aa81e6c8e58a4cdef10ea7e5.tar.gz rust-a2c18616e303b805aa81e6c8e58a4cdef10ea7e5.zip | |
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?
| -rw-r--r-- | src/bootstrap/defaults/config.dist.toml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/defaults/config.dist.toml b/src/bootstrap/defaults/config.dist.toml index 25d9e649f23..44efdf50b96 100644 --- a/src/bootstrap/defaults/config.dist.toml +++ b/src/bootstrap/defaults/config.dist.toml @@ -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] |