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 de57140a75bb5d470739bf89b6660ac61a877aac..6a28bafb8c29345e4e66ac5be10fea5678d15772 100644 (file)
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1024,10 +1024,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 b66abc6bedf0f33437a98f6d7b2cc87ca83c57e5..f6efe1e48da5d34ae45549ccddf97f5b2ce630b3 100644 (file)
--- 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");