From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 13 Jun 2024 09:16:38 +0000 (+0200)
Subject: c-2200-workaround-x32-test
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-3+rpi1^2~46
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc52fda8b090781b464d1608a377843a6cca514b;p=rustc.git

c-2200-workaround-x32-test

Bug: https://github.com/rust-lang/cargo/issues/10005

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-2200-workaround-x32-test.patch
---

diff --git a/src/tools/cargo/tests/testsuite/cfg.rs b/src/tools/cargo/tests/testsuite/cfg.rs
index 9b5cd24076..a4b5d1be71 100644
--- a/src/tools/cargo/tests/testsuite/cfg.rs
+++ b/src/tools/cargo/tests/testsuite/cfg.rs
@@ -280,7 +280,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(