diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-10 09:24:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-10 09:24:41 +0100 |
| commit | 1ce18d2d658eb8b1625965e5a50d040d5c8f05c1 (patch) | |
| tree | 17a9f902150ea7f67f9d940125bf8375be655c45 /config.toml.example | |
| parent | 0f5d3ba30f33116a610e5f9f2bb60f3ce120a167 (diff) | |
| parent | ac672621c0d9f10c0f5026cadba4b326eb213856 (diff) | |
| download | rust-1ce18d2d658eb8b1625965e5a50d040d5c8f05c1.tar.gz rust-1ce18d2d658eb8b1625965e5a50d040d5c8f05c1.zip | |
Rollup merge of #104512 - jyn514:download-ci-llvm-default, r=Mark-Simulacrum
Set `download-ci-llvm = "if-available"` by default when `channel = dev` See https://github.com/rust-lang/compiler-team/issues/566. The motivation for changing the default is to avoid downloading and building LLVM when someone runs `x build` before running `x setup`. The motivation for only doing it on `channel = "dev"` is to avoid breaking distros or users installing from source. It works because `dev` is also the default channel. The diff looks larger than it is; most of it is moving the `llvm` branch below the `rust` so `config.channel` is set. r? `@Mark-Simulacrum` cc `@oli-obk` `@bjorn3` `@cuviper`
Diffstat (limited to 'config.toml.example')
| -rw-r--r-- | config.toml.example | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config.toml.example b/config.toml.example index ca54cbd2d68..5e1d2f2e314 100644 --- a/config.toml.example +++ b/config.toml.example @@ -35,9 +35,6 @@ changelog-seen = 2 # Unless you're developing for a target where Rust CI doesn't build a compiler # toolchain or changing LLVM locally, you probably want to set this to true. # -# This is false by default so that distributions don't unexpectedly download -# LLVM from the internet. -# # All tier 1 targets are currently supported; set this to `"if-available"` if # you are not sure whether you're on a tier 1 target. # @@ -45,7 +42,9 @@ changelog-seen = 2 # # Note that many of the LLVM options are not currently supported for # downloading. Currently only the "assertions" option can be toggled. -#download-ci-llvm = false +# +# Defaults to "if-available" when `channel = "dev"` and "false" otherwise. +#download-ci-llvm = "if-available" # Indicates whether LLVM rebuild should be skipped when running bootstrap. If # this is `false` then the compiler's LLVM will be rebuilt whenever the built |