about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorPietro Albini <pietro.albini@ferrous-systems.com>2022-06-07 12:17:11 +0200
committerPietro Albini <pietro.albini@ferrous-systems.com>2022-06-09 17:54:11 +0200
commitc1a0f49e9f92ce7ebb8c9f2a3baefce779bb5950 (patch)
treeb6d0de13d7edf608670699eed6d85e66d5653fca /src/bootstrap
parenta0411e2bfe1fb939757aa96603f0a10d1d9eb029 (diff)
downloadrust-c1a0f49e9f92ce7ebb8c9f2a3baefce779bb5950.tar.gz
rust-c1a0f49e9f92ce7ebb8c9f2a3baefce779bb5950.zip
keep the same config values in stage0 between invocations
This commit allows users to change the contents of the "config" key in
src/stage0.json without having it overridden the next time the
bump-stage0 tool is executed.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/bootstrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 635e4f3703b..3b2b507b062 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -1043,7 +1043,7 @@ def bootstrap(help_triggered):
     build.checksums_sha256 = data["checksums_sha256"]
     build.stage0_compiler = Stage0Toolchain(data["compiler"])
 
-    build.set_dist_environment(data["dist_server"])
+    build.set_dist_environment(data["config"]["dist_server"])
 
     build.build = args.build or build.build_triple()