From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 4 Aug 2022 07:40:53 +0000 (+0100)
Subject: d-bootstrap-custom-debuginfo-path
X-Git-Tag: archive/raspbian/1.59.0+dfsg1-1_deb11u3+rpi1~1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5da7822870add3ec821e31cb16a9330e2854c32d;p=rustc-mozilla.git

d-bootstrap-custom-debuginfo-path


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

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 930fefd13..b4ce82031 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -927,10 +927,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"),
         }
     }
 
diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
index b66abc6be..f6efe1e48 100644
--- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+++ b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
@@ -7,7 +7,7 @@
 // true automatically. If paths to std library hasn't been remapped, we use the
 // above simulate-remapped-rust-src-base option to do it temporarily
 
-// CHECK: !DIFile(filename: "{{/rustc/.*/library/std/src/panic.rs}}"
+// CHECK: !DIFile(filename: "{{/usr/src/rustc-.*/library/std/src/panic.rs}}"
 fn main() {
     std::thread::spawn(|| {
         println!("hello");