diff options
| author | James Henderson <jh7370@my.bristol.ac.uk> | 2020-01-02 15:34:40 +0000 |
|---|---|---|
| committer | James Henderson <jh7370@my.bristol.ac.uk> | 2020-01-02 16:02:09 +0000 |
| commit | 34397b75609c09c1723cd6c0b27f8f13c641ce4c (patch) | |
| tree | 010fc5bd2fb35e28a2d457e0ac58151608b99aa8 /llvm/cmake/config-ix.cmake | |
| parent | 63336795f0d50a009e8ec034d95811170efc978b (diff) | |
| download | bcm5719-llvm-34397b75609c09c1723cd6c0b27f8f13c641ce4c.tar.gz bcm5719-llvm-34397b75609c09c1723cd6c0b27f8f13c641ce4c.zip | |
Revert "build: make `LLVM_ENABLE_ZLIB` a tri-bool for users"
This reverts commit e6c7ed6d2164a0659fd9f6ee44f1375d301e3cad.
This commit was an attempt to fix the build bots, but it still left the
clang-x64-windows-msvc bot in a broken state.
Diffstat (limited to 'llvm/cmake/config-ix.cmake')
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index a16038f7098..d5a15a680a6 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -117,6 +117,10 @@ endif() # Don't look for these libraries if we're using MSan, since uninstrumented third # party code may call MSan interceptors like strlen, leading to false positives. if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") + if(LLVM_ENABLE_ZLIB) + find_package(ZLIB REQUIRED) + endif() + # Don't look for these libraries on Windows. if (NOT PURE_WINDOWS) # Skip libedit if using ASan as it contains memory leaks. @@ -502,21 +506,7 @@ else( LLVM_ENABLE_THREADS ) endif() if(LLVM_ENABLE_ZLIB) - if(LLVM_ENABLE_ZLIB STREQUAL FORCE_ON) - find_package(ZLIB REQUIRED) - else() - find_package(ZLIB) - endif() - - if(ZLIB_FOUND) - set(LLVM_ENABLE_ZLIB "YES" CACHE STRING - "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON" - FORCE) - else() - set(LLVM_ENABLE_ZLIB "NO" CACHE STRING - "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON" - FORCE) - endif() + find_package(ZLIB REQUIRED) endif() if (LLVM_ENABLE_DOXYGEN) |
