about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@google.com>2020-09-26 00:04:23 +0000
committerTyler Mandry <tmandry@google.com>2020-09-28 20:15:43 +0000
commit6bd57e3531573ea4727b247d1db37046537b4e22 (patch)
tree07ad0d649d7f1adf1e9d05e0b7413837c473f254 /src
parented975054aabfcf3ff5001b182a76ab2f2b2da8c4 (diff)
downloadrust-6bd57e3531573ea4727b247d1db37046537b4e22.tar.gz
rust-6bd57e3531573ea4727b247d1db37046537b4e22.zip
Bump bootstrap version and update changelog
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/CHANGELOG.md11
-rw-r--r--src/bootstrap/bin/main.rs2
2 files changed, 11 insertions, 2 deletions
diff --git a/src/bootstrap/CHANGELOG.md b/src/bootstrap/CHANGELOG.md
index dfb39c54c17..fe426c4cec7 100644
--- a/src/bootstrap/CHANGELOG.md
+++ b/src/bootstrap/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Non-breaking changes since the last major version]
 
+None.
+
+## [Version 2] - 2020-09-25
+
+- `host` now defaults to the value of `build` in all cases
+  + Previously `host` defaulted to an empty list when `target` was overridden, and to `build` otherwise
+
+### Non-breaking changes
+
 - Add `x.py setup` [#76631](https://github.com/rust-lang/rust/pull/76631)
 - Add a changelog for x.py [#76626](https://github.com/rust-lang/rust/pull/76626)
 - Optionally, download LLVM from CI on Linux and NixOS
@@ -21,7 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#77120](https://github.com/rust-lang/rust/pull/77120).
 
 
-## [Version 0] - 2020-09-11
+## [Version 1] - 2020-09-11
 
 This is the first changelog entry, and it does not attempt to be an exhaustive list of features in x.py.
 Instead, this documents the changes to bootstrap in the past 2 months.
diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs
index 637083e08d5..d31f95ee5e9 100644
--- a/src/bootstrap/bin/main.rs
+++ b/src/bootstrap/bin/main.rs
@@ -40,7 +40,7 @@ fn main() {
 }
 
 fn check_version(config: &Config) -> Option<String> {
-    const VERSION: usize = 1;
+    const VERSION: usize = 2;
 
     let mut msg = String::new();