From bbc3cd43784b69beda25dc0f002514d656d853a2 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 25 Oct 2018 10:29:08 +0200 Subject: [PATCH] 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 Signed-off-by: Marc-Antoine Perennou --- src/bootstrap/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 4e26c98a62759..ab3d0b51370f1 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -765,7 +765,7 @@ impl Build { 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"),