diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-05-30 21:06:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 21:06:45 +0200 |
| commit | 957badbcc4583bbd1cf5a4f866f8a2962e6d43b0 (patch) | |
| tree | f104ff4c0dc720e069e8096da685ed9cdd2a114e | |
| parent | bdd70622e2a721b8b384df103e8514372fef1150 (diff) | |
| parent | 53bf79e11c136d8e177ad83cfab371af43100b4f (diff) | |
| download | rust-957badbcc4583bbd1cf5a4f866f8a2962e6d43b0.tar.gz rust-957badbcc4583bbd1cf5a4f866f8a2962e6d43b0.zip | |
Rollup merge of #85762 - mati865:disable-zlib-on-windows, r=Mark-Simulacrum
Do not try to build LLVM with Zlib on Windows Fixes https://github.com/rust-lang/rust/issues/85422 Fixes https://github.com/rust-lang/rust/issues/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.
| -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"); |