diff options
| author | kennytm <kennytm@gmail.com> | 2018-10-26 18:25:10 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-10-26 23:06:41 +0800 |
| commit | 2e1e8d29130fe5db2e8beceb7981a0197aaff772 (patch) | |
| tree | 3c479fbc6d78c04c40922ef39305a2e6e325185a /src/bootstrap | |
| parent | 5c94daa0171bc25e23efdd3ed698378c2852d500 (diff) | |
| parent | bbc3cd43784b69beda25dc0f002514d656d853a2 (diff) | |
| download | rust-2e1e8d29130fe5db2e8beceb7981a0197aaff772.tar.gz rust-2e1e8d29130fe5db2e8beceb7981a0197aaff772.zip | |
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
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 4e26c98a627..ab3d0b51370 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"), |