1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 13:17:39 +0200
Subject: d-bootstrap-custom-debuginfo-path
Forwarded: not-needed
===================================================================
---
src/bootstrap/src/lib.rs | 5 ++---
tests/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index ccc115a..d483301 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -1148,10 +1148,9 @@ Executed at: {executed_at}"#,
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/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
index eb61016..9119c1d 100644
--- a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
+++ b/tests/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");
|
