Skip to content

Commit

Permalink
Do not try to build LLVM with Zlib on Windows (#332)
Browse files Browse the repository at this point in the history
CMake is accidentally picking up zlib from the CI environment, see actions/runner-images#6627 (comment), the build log now has this line:
```
  -- Found ZLIB: C:/Strawberry/c/lib/libz.a (found version "1.2.11")
```

Disable zlib on Windows since we don't want the dependency there, this is also what Rust did a while back: rust-lang/rust#85762

(cherry picked from commit ea445e4)
  • Loading branch information
akoeplinger committed Dec 14, 2022
1 parent 0b3ae86 commit 1c0c872
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions llvm.proj
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'OSX'" Include='-DLLVM_EXTERNALIZE_DEBUGINFO_EXTENSION=dwarf -DLLVM_EXTERNALIZE_DEBUGINFO_FLATTEN:BOOL=ON' />
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'Windows_NT'" Include='-DLLVM_USE_CRT_DEBUG=MT' />
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'Windows_NT'" Include='-DLLVM_USE_CRT_RELEASE=MT' />
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'Windows_NT'" Include='-DLLVM_ENABLE_ZLIB=OFF' />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 1c0c872

Please sign in to comment.