summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorJames Henderson <jh7370@my.bristol.ac.uk>2020-01-02 15:34:40 +0000
committerJames Henderson <jh7370@my.bristol.ac.uk>2020-01-02 16:02:09 +0000
commit34397b75609c09c1723cd6c0b27f8f13c641ce4c (patch)
tree010fc5bd2fb35e28a2d457e0ac58151608b99aa8 /llvm/lib
parent63336795f0d50a009e8ec034d95811170efc978b (diff)
downloadbcm5719-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/lib')
-rw-r--r--llvm/lib/Support/CMakeLists.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index 26332d4f539..2fa641ff5da 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -1,7 +1,4 @@
-if(LLVM_ENABLE_ZLIB)
- set(system_libs ${ZLIB_LIBRARY})
-endif()
-
+set(system_libs ${ZLIB_LIBRARY})
if( MSVC OR MINGW )
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
OpenPOWER on IntegriCloud