diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 04:04:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 04:04:52 +0000 |
| commit | 2bbd74a6bb04bb919e4391350ca93daf965450f5 (patch) | |
| tree | bd68876c4f219286193a04699ec81104a8e489ad /debian/patches/d-bootstrap-custom-debuginfo-path.patch | |
| parent | Merging upstream version 1.73.0+dfsg1. (diff) | |
| download | rustc-2bbd74a6bb04bb919e4391350ca93daf965450f5.tar.xz rustc-2bbd74a6bb04bb919e4391350ca93daf965450f5.zip | |
Merging debian version 1.73.0+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/d-bootstrap-custom-debuginfo-path.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch index e989666a1..39f246be1 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -12,12 +12,12 @@ Index: rust/src/bootstrap/lib.rs =================================================================== --- rust.orig/src/bootstrap/lib.rs +++ rust/src/bootstrap/lib.rs -@@ -1110,10 +1110,9 @@ impl Build { +@@ -1145,10 +1145,9 @@ impl Build { match which { GitRepo::Rustc => { - let sha = self.rust_sha().unwrap_or(&self.version); -- Some(format!("/rustc/{}", sha)) +- Some(format!("/rustc/{sha}")) + Some(format!("/usr/src/rustc-{}", &self.version)) } - GitRepo::Llvm => Some(String::from("/rustc/llvm")), |