From cf94bdc0742c13e2a0cac864c478b8626b266e1b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:11:38 +0200 Subject: Merging upstream version 1.66.0+dfsg1. Signed-off-by: Daniel Baumann --- src/bootstrap/tarball.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/bootstrap/tarball.rs') diff --git a/src/bootstrap/tarball.rs b/src/bootstrap/tarball.rs index e30067a5c..d999b6c15 100644 --- a/src/bootstrap/tarball.rs +++ b/src/bootstrap/tarball.rs @@ -4,6 +4,7 @@ use std::{ }; use crate::builder::Builder; +use crate::channel; use crate::util::t; #[derive(Copy, Clone)] @@ -297,8 +298,9 @@ impl<'a> Tarball<'a> { fn run(self, build_cli: impl FnOnce(&Tarball<'a>, &mut Command)) -> GeneratedTarball { t!(std::fs::create_dir_all(&self.overlay_dir)); self.builder.create(&self.overlay_dir.join("version"), &self.overlay.version(self.builder)); - if let Some(sha) = self.builder.rust_sha() { - self.builder.create(&self.overlay_dir.join("git-commit-hash"), &sha); + if let Some(info) = self.builder.rust_info.info() { + channel::write_commit_hash_file(&self.overlay_dir, &info.sha); + channel::write_commit_info_file(&self.overlay_dir, info); } for file in self.overlay.legal_and_readme() { self.builder.install(&self.builder.src.join(file), &self.overlay_dir, 0o644); -- cgit v1.2.3