diff options
| author | Jieyou Xu <jieyouxu@outlook.com> | 2024-11-10 19:58:10 +0800 |
|---|---|---|
| committer | Jieyou Xu <jieyouxu@outlook.com> | 2024-11-10 20:31:18 +0800 |
| commit | c0cee4e36b5f0964bdeb2ac12cfd9002addb51cc (patch) | |
| tree | 4b20b4b9256aa6b2bc7c852183f85551b45bf1f6 /src/bootstrap/defaults | |
| parent | c24e166527cd46d3b4033b0c061d02657e3c3cbf (diff) | |
| download | rust-c0cee4e36b5f0964bdeb2ac12cfd9002addb51cc.tar.gz rust-c0cee4e36b5f0964bdeb2ac12cfd9002addb51cc.zip | |
Revert "Rollup merge of #132772 - onur-ozkan:download-rustc-default, r=jieyouxu"
This reverts commit c435fa8c4b55f0f8ef8e2e839ce7de960613267e, reversing changes made to 88acd493f9dbbc8228db2b123c9b4132a995de92. Seems to have unintentionally omitted commit hash leading to <https://github.com/rust-lang/rust/pull/132772>.
Diffstat (limited to 'src/bootstrap/defaults')
| -rw-r--r-- | src/bootstrap/defaults/config.dist.toml | 1 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.library.toml | 3 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.tools.toml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/bootstrap/defaults/config.dist.toml b/src/bootstrap/defaults/config.dist.toml index 4346a9c2dd1..d4feffe0227 100644 --- a/src/bootstrap/defaults/config.dist.toml +++ b/src/bootstrap/defaults/config.dist.toml @@ -11,7 +11,6 @@ extended = true # Most users installing from source want to build all parts of the project from source. [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. diff --git a/src/bootstrap/defaults/config.library.toml b/src/bootstrap/defaults/config.library.toml index 5447565a4b0..3d697be8156 100644 --- a/src/bootstrap/defaults/config.library.toml +++ b/src/bootstrap/defaults/config.library.toml @@ -8,6 +8,9 @@ bench-stage = 0 [rust] # This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower. incremental = true +# Download rustc from CI instead of building it from source. +# For stage > 1 builds, this cuts compile times significantly when there are no changes on "compiler" tree. +download-rustc = "if-unchanged" # Make the compiler and standard library faster to build, at the expense of a ~20% runtime slowdown. lto = "off" diff --git a/src/bootstrap/defaults/config.tools.toml b/src/bootstrap/defaults/config.tools.toml index 76b47a841b3..27c1d1cf26d 100644 --- a/src/bootstrap/defaults/config.tools.toml +++ b/src/bootstrap/defaults/config.tools.toml @@ -3,6 +3,11 @@ [rust] # This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower. incremental = true +# Download rustc from CI instead of building it from source. +# For stage > 1 builds, this cuts compile times significantly when there are no changes on "compiler" tree. +# Using these defaults will download the stage2 compiler (see `download-rustc` +# setting) and the stage2 toolchain should therefore be used for these defaults. +download-rustc = "if-unchanged" [build] # Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile. |