about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorDavid Wood <david.wood@huawei.com>2021-10-01 12:41:18 +0000
committerDavid Wood <david.wood@huawei.com>2021-10-02 20:01:43 +0000
commite552c0d86baebdf594b9cacebbcf5207e57207d5 (patch)
treee8302f5ed832c07b68454b2a3c31d82f4896a32c /config.toml.example
parent4e4942dfa66667c0addfff8e0882a59b035d45ca (diff)
downloadrust-e552c0d86baebdf594b9cacebbcf5207e57207d5.tar.gz
rust-e552c0d86baebdf594b9cacebbcf5207e57207d5.zip
bootstrap: add config option for nix patching
On NixOS systems, bootstrap will patch rustc used in bootstrapping after
checking `/etc/os-release` (to confirm the current distribution is NixOS).
However, when using Nix on a non-NixOS system, it can be desirable for
bootstrap to patch rustc. In this commit, a `patch-binaries-for-nix`
option is added to `config.toml`, which allows for user opt-in to
bootstrap's Nix patching.

Signed-off-by: David Wood <david.wood@huawei.com>
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example6
1 files changed, 6 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example
index aff4e8fa82a..d811b914d20 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -313,6 +313,12 @@ changelog-seen = 2
 # this setting's very existence, are all subject to change.)
 #print-step-rusage = false
 
+# Always patch binaries for usage with Nix toolchains. If `true` then binaries
+# will be patched unconditionally. If `false` or unset, binaries will be patched
+# only if the current distribution is NixOS. This option is useful when using
+# a Nix toolchain on non-NixOS distributions.
+#patch-binaries-for-nix = false
+
 # =============================================================================
 # General install configuration options
 # =============================================================================