diff options
| author | onur-ozkan <work@onurozkan.dev> | 2024-11-10 22:34:25 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2024-11-13 08:21:03 +0300 |
| commit | 1837f6f5b10865f0405e4ca3039c016f9cf6c0da (patch) | |
| tree | 162dc218365f90a520c437360c02eb92c6697b04 /src/bootstrap/defaults | |
| parent | 242f20dc1e95ca8def0ff436d7c844811ae7ac25 (diff) | |
| download | rust-1837f6f5b10865f0405e4ca3039c016f9cf6c0da.tar.gz rust-1837f6f5b10865f0405e4ca3039c016f9cf6c0da.zip | |
Reapply "Rollup merge of #132772 - onur-ozkan:download-rustc-default, r=jieyouxu"
This reverts commit c0cee4e36b5f0964bdeb2ac12cfd9002addb51cc.
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, 1 insertions, 8 deletions
diff --git a/src/bootstrap/defaults/config.dist.toml b/src/bootstrap/defaults/config.dist.toml index d4feffe0227..4346a9c2dd1 100644 --- a/src/bootstrap/defaults/config.dist.toml +++ b/src/bootstrap/defaults/config.dist.toml @@ -11,6 +11,7 @@ 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 3d697be8156..5447565a4b0 100644 --- a/src/bootstrap/defaults/config.library.toml +++ b/src/bootstrap/defaults/config.library.toml @@ -8,9 +8,6 @@ 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 27c1d1cf26d..76b47a841b3 100644 --- a/src/bootstrap/defaults/config.tools.toml +++ b/src/bootstrap/defaults/config.tools.toml @@ -3,11 +3,6 @@ [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. |