From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Tue, 1 Dec 2020 19:57:48 +0000 (+0000)
Subject: d-custom-debuginfo-path
X-Git-Tag: archive/raspbian/1.48.0+dfsg1-1+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4e601d2e8dfc642b7d56967899c244d75ccbba50;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 852316a8d8..ecb8abb45c 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -797,10 +797,9 @@ impl Build {
 
         match which {
             GitRepo::Rustc => {
-                let sha = self.rust_sha().unwrap_or(&self.version);
-                Some(format!("/rustc/{}", sha))
+                Some(format!("/usr/src/rustc-{}", &self.version))
             }
-            GitRepo::Llvm => Some(String::from("/rustc/llvm")),
+            GitRepo::Llvm => panic!("GitRepo::Llvm unsupported on Debian"),
         }
     }