Skip to content

Commit

Permalink
Auto merge of #75655 - nielx:fix/haiku-llvm-libz, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Disable zlib in LLVM on Haiku

PR #72696 enabled the option LLVM_ENABLE_ZLIB for the LLVM builds. Like NetBSD and aarch64-apple-darwin (see PR #75500), the LLVM build system not explicitly linking to libz on these platforms cause issues. For Haiku, this meant the runtime loader complaining about undefined symbols..
  • Loading branch information
bors committed Sep 4, 2020
2 parents ef55a0a + 0f6bcb7 commit 80cacd7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_llvm/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ 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") {
} else if target.contains("netbsd") || target.contains("haiku") {
println!("cargo:rustc-link-lib=z");
}
cmd.args(&components);
Expand Down

0 comments on commit 80cacd7

Please sign in to comment.