diff options
| author | bors <bors@rust-lang.org> | 2020-09-04 14:32:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-04 14:32:33 +0000 |
| commit | 80cacd77954b39a6bc205213faa8c82c97eb0055 (patch) | |
| tree | 10f1d38b713e945d19381f28c990b621175538f1 | |
| parent | ef55a0a92f3cb6572ef67d99f4aefbdeb7b6b804 (diff) | |
| parent | 0f6bcb797a8be743f6c60e20d3e0e324a89372c9 (diff) | |
Auto merge of #75655 - nielx:fix/haiku-llvm-libz, r=Mark-Simulacrum
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..
| -rw-r--r-- | src/librustc_llvm/build.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index a45028eafe1..306ffbf5daa 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -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); |