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

kennytm · kennytm · commit 2e1e8d29130f · 2018-10-26T23:06:41.000+08:00
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 rust-lang#55341
diff --git 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"),

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ impl Build {`
`765`	`765`
`766`	`766`	`let path = match which {`
`767`	`767`	`GitRepo::Rustc => {`
`768`		`- let sha = self.rust_info.sha().expect("failed to find sha");`
	`768`	`+ let sha = self.rust_sha().unwrap_or(channel::CFG_RELEASE_NUM);`
`769`	`769`	`format!("/rustc/{}", sha)`
`770`	`770`	`}`
`771`	`771`	`GitRepo::Llvm => format!("/rustc/llvm"),`