Auto merge of #75713 - mati865:netbsd_zlib, r=Mark-Simulacrum

Enable zlib for NetBSD

NetBSD Docker dist job passed locally.

Author: bors

src/bootstrap/native.rs

@@ -178,11 +178,9 @@ impl Step for Llvm {
             .define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap())
             .define("LLVM_DEFAULT_TARGET_TRIPLE", target_native);
 
-        if !target.contains("netbsd") && target != "aarch64-apple-darwin" {
+        if target != "aarch64-apple-darwin" {
             cfg.define("LLVM_ENABLE_ZLIB", "ON");
         } else {
-            // FIXME: Enable zlib on NetBSD too
-            // https://github.com/rust-lang/rust/pull/72696#issuecomment-641517185
             cfg.define("LLVM_ENABLE_ZLIB", "OFF");
         }
 

src/librustc_llvm/build.rs

@@ -198,6 +198,8 @@ fn main() {
     } else if target.contains("windows-gnu") {
         println!("cargo:rustc-link-lib=shell32");
         println!("cargo:rustc-link-lib=uuid");
+    } else if target.contains("netbsd") {
+        println!("cargo:rustc-link-lib=z");
     }
     cmd.args(&components);