summaryrefslogtreecommitdiffstats
path: root/debian/patches/c-2200-workaround-x32-test.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
commita5cb27bed2202818ee204db23f8488a7794d6ec3 (patch)
tree4a38fb6c257e5031269038e525d11a7c2f0fdb1b /debian/patches/c-2200-workaround-x32-test.patch
parentMerging upstream version 1.70.0+dfsg2. (diff)
downloadrustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.tar.xz
rustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.zip
Adding debian version 1.70.0+dfsg2-1.debian/1.70.0+dfsg2-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/c-2200-workaround-x32-test.patch')
-rw-r--r--debian/patches/c-2200-workaround-x32-test.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/debian/patches/c-2200-workaround-x32-test.patch b/debian/patches/c-2200-workaround-x32-test.patch
new file mode 100644
index 000000000..9dc42ddbc
--- /dev/null
+++ b/debian/patches/c-2200-workaround-x32-test.patch
@@ -0,0 +1,15 @@
+Bug: https://github.com/rust-lang/cargo/issues/10005
+
+Index: rust/src/tools/cargo/tests/testsuite/cfg.rs
+===================================================================
+--- rust.orig/src/tools/cargo/tests/testsuite/cfg.rs
++++ rust/src/tools/cargo/tests/testsuite/cfg.rs
+@@ -272,7 +272,7 @@ fn any_ok() {
+
+ // https://github.com/rust-lang/cargo/issues/5313
+ #[cargo_test]
+-#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
++#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu", target_pointer_width = "64"))]
+ fn cfg_looks_at_rustflags_for_target() {
+ let p = project()
+ .file(