Skip to content

Commit 957badb

Browse files
Rollup merge of #85762 - mati865:disable-zlib-on-windows, r=Mark-Simulacrum
Do not try to build LLVM with Zlib on Windows Fixes #85422 Fixes #85624 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.
2 parents bdd7062 + 53bf79e commit 957badb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/native.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl Step for Llvm {
181181
.define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap())
182182
.define("LLVM_DEFAULT_TARGET_TRIPLE", target_native);
183183

184-
if target != "aarch64-apple-darwin" {
184+
if target != "aarch64-apple-darwin" && !target.contains("windows") {
185185
cfg.define("LLVM_ENABLE_ZLIB", "ON");
186186
} else {
187187
cfg.define("LLVM_ENABLE_ZLIB", "OFF");

0 commit comments

Comments
 (0)