diff options
| author | Mateusz Mikuła <mati865@gmail.com> | 2021-05-27 23:12:15 +0200 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2021-05-27 23:20:25 +0200 |
| commit | 53bf79e11c136d8e177ad83cfab371af43100b4f (patch) | |
| tree | ca5d5434f5b608512396f5e550a35a05aebf1712 | |
| parent | d854c3c0e9d256b923fbfc8b5193433a6edcd08f (diff) | |
| download | rust-53bf79e11c136d8e177ad83cfab371af43100b4f.tar.gz rust-53bf79e11c136d8e177ad83cfab371af43100b4f.zip | |
Do not try to build LLVM with Zlib on Windows
We do not install Zlib on the CI but recent builds somehow started picking it's shared version. To avoid relying on CI binaries so let's explicitly disable it.
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index bde0a96f030..3f4715e78a9 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -181,7 +181,7 @@ impl Step for Llvm { .define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap()) .define("LLVM_DEFAULT_TARGET_TRIPLE", target_native); - if target != "aarch64-apple-darwin" { + if target != "aarch64-apple-darwin" && !target.contains("windows") { cfg.define("LLVM_ENABLE_ZLIB", "ON"); } else { cfg.define("LLVM_ENABLE_ZLIB", "OFF"); |