From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 29 Aug 2020 15:54:36 +0000 (+0100)
Subject: d-custom-debuginfo-path
X-Git-Tag: archive/raspbian/1.46.0+dfsg1-1+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=05a325ee8b32ed00ffd1bec9d37e2d5af232a9ac;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 783a64c358..df66492662 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -783,10 +783,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"),
         }
     }