Rollup merge of #55343 - Keruspe:remap-debuginfo-release, r=alexcrichton

rustbuild: fix remap-debuginfo when building a release

Fallback to the release number as we can't get the git commit sha as we're not in a git repository.

Fixes #55341

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 4e26c98a627597c158de18f952d82ed6a8a229e6..ab3d0b51370f142dfdd4e73615bd63c96e158b56 100644 (file)
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -765,7 +765,7 @@ fn debuginfo_map(&self, which: GitRepo) -> Option<String> {
 
         let path = match which {
             GitRepo::Rustc => {
-                let sha = self.rust_info.sha().expect("failed to find sha");
+                let sha = self.rust_sha().unwrap_or(channel::CFG_RELEASE_NUM);
                 format!("/rustc/{}", sha)
             }
             GitRepo::Llvm => format!("/rustc/llvm"),