From 2f546711a4f565068dcfefc2871218c062bc771c Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Thu, 14 Jul 2022 13:17:39 +0200 Subject: [PATCH] d-bootstrap-custom-debuginfo-path Forwarded: not-needed =================================================================== Gbp-Pq: Topic build Gbp-Pq: Name d-bootstrap-custom-debuginfo-path.patch --- 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 cde090637e..a08833e4af 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -1230,10 +1230,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/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs index eb610168dd..9119c1d92e 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"); -- 2.30.2