summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-custom-debuginfo-path.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-07 05:48:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-07 05:48:47 +0000
commit8274ece7b836b5e6312e1aa97bebdf8c1f1cb464 (patch)
tree20423151acc1cca6978e0d0cefe44638f26ad4b9 /debian/patches/d-bootstrap-custom-debuginfo-path.patch
parentMerging upstream version 1.75.0+dfsg1. (diff)
downloadrustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.tar.xz
rustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.zip
Adding debian version 1.75.0+dfsg1-3.debian/1.75.0+dfsg1-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-custom-debuginfo-path.patch')
-rw-r--r--debian/patches/d-bootstrap-custom-debuginfo-path.patch24
1 files changed, 19 insertions, 5 deletions
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
index 39f246be1..581c83e83 100644
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
@@ -4,15 +4,15 @@ Subject: d-bootstrap-custom-debuginfo-path
===================================================================
---
- src/bootstrap/lib.rs | 5 ++---
+ src/bootstrap/src/lib.rs | 5 ++---
src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
-Index: rust/src/bootstrap/lib.rs
+Index: rust/src/bootstrap/src/lib.rs
===================================================================
---- rust.orig/src/bootstrap/lib.rs
-+++ rust/src/bootstrap/lib.rs
-@@ -1145,10 +1145,9 @@ impl Build {
+--- rust.orig/src/bootstrap/src/lib.rs
++++ rust/src/bootstrap/src/lib.rs
+@@ -1163,10 +1163,9 @@ impl Build {
match which {
GitRepo::Rustc => {
@@ -38,3 +38,17 @@ Index: rust/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
fn main() {
std::thread::spawn(|| {
println!("hello");
+Index: rust/src/bootstrap/src/core/builder.rs
+===================================================================
+--- rust.orig/src/bootstrap/src/core/builder.rs
++++ rust/src/bootstrap/src/core/builder.rs
+@@ -1775,7 +1775,8 @@ impl<'a> Builder<'a> {
+ cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to);
+ }
+
+- if self.config.rust_remap_debuginfo {
++ // Debian: this breaks with our vendored sources!
++ if false && self.config.rust_remap_debuginfo {
+ // FIXME: handle vendored sources
+ let registry_src = t!(home::cargo_home()).join("registry").join("src");
+ let mut env_var = OsString::new();