From dc0db358abe19481e475e10c32149b53370f1a1c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:31 +0200 Subject: Merging upstream version 1.72.1+dfsg1. Signed-off-by: Daniel Baumann --- src/bootstrap/defaults/config.dist.toml | 22 ++++++++++++++++++++++ src/bootstrap/defaults/config.tools.toml | 2 ++ src/bootstrap/defaults/config.user.toml | 19 ------------------- 3 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 src/bootstrap/defaults/config.dist.toml delete mode 100644 src/bootstrap/defaults/config.user.toml (limited to 'src/bootstrap/defaults') diff --git a/src/bootstrap/defaults/config.dist.toml b/src/bootstrap/defaults/config.dist.toml new file mode 100644 index 000000000..44efdf50b --- /dev/null +++ b/src/bootstrap/defaults/config.dist.toml @@ -0,0 +1,22 @@ +# These defaults are meant for users and distro maintainers building from source, without intending to make multiple changes. +[build] +# When compiling from source, you almost always want a full stage 2 build, +# which has all the latest optimizations from nightly. +build-stage = 2 +test-stage = 2 +doc-stage = 2 +# When compiling from source, you usually want all tools. +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. +channel = "nightly" +download-rustc = false + +[dist] +# Use better compression when preparing tarballs. +compression-profile = "balanced" diff --git a/src/bootstrap/defaults/config.tools.toml b/src/bootstrap/defaults/config.tools.toml index 6b6625342..79424f28d 100644 --- a/src/bootstrap/defaults/config.tools.toml +++ b/src/bootstrap/defaults/config.tools.toml @@ -9,6 +9,8 @@ debug-logging = true incremental = true # Download rustc from CI instead of building it from source. # This cuts compile times by almost 60x, but means you can't modify the compiler. +# 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] diff --git a/src/bootstrap/defaults/config.user.toml b/src/bootstrap/defaults/config.user.toml deleted file mode 100644 index 25d9e649f..000000000 --- a/src/bootstrap/defaults/config.user.toml +++ /dev/null @@ -1,19 +0,0 @@ -# These defaults are meant for users and distro maintainers building from source, without intending to make multiple changes. -[build] -# When compiling from source, you almost always want a full stage 2 build, -# which has all the latest optimizations from nightly. -build-stage = 2 -test-stage = 2 -doc-stage = 2 -# When compiling from source, you usually want all tools. -extended = true - -# Most users installing from source want to build all parts of the project from source. -[llvm] -download-ci-llvm = false -[rust] -download-rustc = false - -[dist] -# Use better compression when preparing tarballs. -compression-profile = "balanced" -- cgit v1.2.3