diff options
| author | Hans Wennborg <hans@chromium.org> | 2020-03-03 09:45:14 +0100 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-03-03 14:31:05 +0100 |
| commit | 5f9211bc46fa1a8d1db3a2bc27c2b115cd617795 (patch) | |
| tree | 24cc9f1548a9fe44c228bb76c9e6f5d09a879e3c /llvm/unittests/Support | |
| parent | 001c8aac80e3924c33a4cc644cca58401c72fe6b (diff) | |
| download | bcm5719-llvm-5f9211bc46fa1a8d1db3a2bc27c2b115cd617795.tar.gz bcm5719-llvm-5f9211bc46fa1a8d1db3a2bc27c2b115cd617795.zip | |
Revert abb00753 "build: reduce CMake handling for zlib" (PR44780)
and follow-ups:
a2ca1c2d "build: disable zlib by default on Windows"
2181bf40 "[CMake] Link against ZLIB::ZLIB"
1079c68a "Attempt to fix ZLIB CMake logic on Windows"
This changed the output of llvm-config --system-libs, and more
importantly it broke stand-alone builds. Instead of piling on more fix
attempts, let's revert this to reduce the risk of more breakages.
(cherry picked from commit 916be8fd6a0a0feea4cefcbeb0c22c65848d7a2e)
Diffstat (limited to 'llvm/unittests/Support')
| -rw-r--r-- | llvm/unittests/Support/CompressionTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/unittests/Support/CompressionTest.cpp b/llvm/unittests/Support/CompressionTest.cpp index 51723898e95..cc7be431b62 100644 --- a/llvm/unittests/Support/CompressionTest.cpp +++ b/llvm/unittests/Support/CompressionTest.cpp @@ -21,7 +21,7 @@ using namespace llvm; namespace { -#if LLVM_ENABLE_ZLIB +#if LLVM_ENABLE_ZLIB == 1 && HAVE_LIBZ void TestZlibCompression(StringRef Input, int Level) { SmallString<32> Compressed; |
