From: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Date: Tue, 8 Oct 2024 10:58:44 +0000 (+0200)
Subject: libz-sys: allow cross-building
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-2+rpi1~6^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b2aa2dfe74a6cb2f44fceeb674579a0073836e7;p=rustc.git

libz-sys: allow cross-building

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

Gbp-Pq: Topic vendor
Gbp-Pq: Name libz-sys-allow-cross-building.patch
---

diff --git a/vendor/libz-sys-1.1.20/build.rs b/vendor/libz-sys-1.1.20/build.rs
index cab160ae6e..810084ec2e 100644
--- a/vendor/libz-sys-1.1.20/build.rs
+++ b/vendor/libz-sys-1.1.20/build.rs
@@ -81,12 +81,10 @@ fn main() {
     //
     // Apple platforms have libz.1.dylib, and it's usually available even when
     // cross compiling (via fat binary or in the target's Xcode SDK)
+    //
+    // Debian: allow cross-building!
     let cross_compiling = target != host;
-    if target.contains("msvc")
-        || target.contains("pc-windows-gnu")
-        || want_static
-        || (cross_compiling && !target.contains("-apple-"))
-    {
+    if target.contains("msvc") || target.contains("pc-windows-gnu") || want_static {
         return build_zlib(&mut cfg, &target);
     }