From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 7 Nov 2020 21:21:03 +0000 (+0000)
Subject: d-custom-debuginfo-path
X-Git-Tag: archive/raspbian/1.47.0+dfsg1-1+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6db417cae0cccc41fa730e04231c1245106a2d5c;p=rustc.git

d-custom-debuginfo-path

===================================================================

Gbp-Pq: Name d-custom-debuginfo-path.patch
---

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index a42ee11bd6..5687e104f3 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -777,10 +777,9 @@ impl Build {
 
         match which {
             GitRepo::Rustc => {
-                let sha = self.rust_sha().unwrap_or(channel::CFG_RELEASE_NUM);
-                Some(format!("/rustc/{}", sha))
+                Some(format!("/usr/src/rustc-{}", channel::CFG_RELEASE_NUM))
             }
-            GitRepo::Llvm => Some(String::from("/rustc/llvm")),
+            GitRepo::Llvm => panic!("GitRepo::Llvm unsupported on Debian"),
         }
     }