Skip to content

Commit

Permalink
Rollup merge of rust-lang#55343 - Keruspe:remap-debuginfo-release, r=…
Browse files Browse the repository at this point in the history
…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 rust-lang#55341
  • Loading branch information
kennytm committed Oct 26, 2018
2 parents 28c890e + bbc3cd4 commit c224599
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit c224599

Please sign in to comment.