OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Enable zlib for NetBSD

NetBSD Docker dist job passed locally.
This commit is contained in:
bors 2020-08-29 19:04:26 +00:00
commit 2a2be9a2c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/native.rs
View File

@ -178,11 +178,9 @@ impl Step for Llvm {
.define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap()) .define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap())
.define("LLVM_DEFAULT_TARGET_TRIPLE", target_native); .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"); cfg.define("LLVM_ENABLE_ZLIB", "ON");
} else { } else {
// FIXME: Enable zlib on NetBSD too
// https://github.com/rust-lang/rust/pull/72696#issuecomment-641517185
cfg.define("LLVM_ENABLE_ZLIB", "OFF"); cfg.define("LLVM_ENABLE_ZLIB", "OFF");
} }

2
src/librustc_llvm/build.rs
View File

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