Rollup merge of #102488 - compiler-errors:gat-compatibility, r=oli-obk

[rust.git] / src / bootstrap / dist.rs

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index f273e0249e8c20503a48a6db93f167fe4e5550ea..7eb8f8bbb30ed9f38c6188a0437aa68a1ec9ff9a 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -920,6 +920,7 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
         // Create the version file
         builder.create(&plain_dst_src.join("version"), &builder.rust_version());
         if let Some(info) = builder.rust_info.info() {
+            channel::write_commit_hash_file(&plain_dst_src, &info.sha);
             channel::write_commit_info_file(&plain_dst_src, info);
         }
 
@@ -1366,6 +1367,7 @@ macro_rules! add_component {
         }
 
         add_component!("rust-docs" => Docs { host: target });
+        add_component!("rust-json-docs" => JsonDocs { host: target });
         add_component!("rust-demangler"=> RustDemangler { compiler, target });
         add_component!("cargo" => Cargo { compiler, target });
         add_component!("rustfmt" => Rustfmt { compiler, target });