diff options
| author | bors <bors@rust-lang.org> | 2020-08-29 19:04:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-29 19:04:26 +0000 |
| commit | 2a2be9a2c34903b5a2de7f0337c9e0e08f700ccf (patch) | |
| tree | d195fcccc1f3b28457cb5d5c9204733c23bc033f | |
| parent | 7fc048f0712ba515ca11fac204921b9ad8a0c5a3 (diff) | |
| parent | 985df3d55edde08ca662e04ab6b47cfb858e56e0 (diff) | |
| download | rust-2a2be9a2c34903b5a2de7f0337c9e0e08f700ccf.tar.gz rust-2a2be9a2c34903b5a2de7f0337c9e0e08f700ccf.zip | |
Auto merge of #75713 - mati865:netbsd_zlib, r=Mark-Simulacrum
Enable zlib for NetBSD NetBSD Docker dist job passed locally.
| -rw-r--r-- | src/bootstrap/native.rs | 4 | ||||
| -rw-r--r-- | src/librustc_llvm/build.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 97d9dbdd63f..e9d0c017c7b 100644 --- a/src/bootstrap/native.rs +++ b/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"); } diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index 25c0b40c495..a45028eafe1 100644 --- a/src/librustc_llvm/build.rs +++ b/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); |