Skip to content

Commit 2e0afc8

Browse files
committed
respect to global download-rustc default in non-dist profiles
Signed-off-by: onur-ozkan <[email protected]>
1 parent cce6f03 commit 2e0afc8

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

src/bootstrap/defaults/config.dist.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ extended = true
1111
# Most users installing from source want to build all parts of the project from source.
1212
[llvm]
1313
download-ci-llvm = false
14+
1415
[rust]
1516
# We have several defaults in bootstrap that depend on whether the channel is `dev` (e.g. `omit-git-hash` and `download-ci-llvm`).
1617
# Make sure they don't get set when installing from source.

src/bootstrap/defaults/config.library.toml

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ bench-stage = 0
88
[rust]
99
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
1010
incremental = true
11-
# Download rustc from CI instead of building it from source.
12-
# For stage > 1 builds, this cuts compile times significantly when there are no changes on "compiler" tree.
13-
download-rustc = "if-unchanged"
1411
# Make the compiler and standard library faster to build, at the expense of a ~20% runtime slowdown.
1512
lto = "off"
1613

src/bootstrap/defaults/config.tools.toml

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
[rust]
44
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
55
incremental = true
6-
# Download rustc from CI instead of building it from source.
7-
# For stage > 1 builds, this cuts compile times significantly when there are no changes on "compiler" tree.
8-
# Using these defaults will download the stage2 compiler (see `download-rustc`
9-
# setting) and the stage2 toolchain should therefore be used for these defaults.
10-
download-rustc = "if-unchanged"
116

127
[build]
138
# Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile.

0 commit comments

Comments
 (0)