diff options
| author | Christian Kühnel <kuhnel@google.com> | 2020-08-07 09:36:49 +0200 |
|---|---|---|
| committer | Christian Kühnel <kuhnel@google.com> | 2020-08-07 09:36:49 +0200 |
| commit | f3cc4df51da4331b170065e01a6a80ee05ed0c23 (patch) | |
| tree | 45c38ff01ffea6692a4875df90648f9b63509693 /llvm/lib/Support/Compression.cpp | |
| parent | 9b49a4d30120801aca5962504fc039c3fd6b2007 (diff) | |
| download | llvm-f3cc4df51da4331b170065e01a6a80ee05ed0c23.zip llvm-f3cc4df51da4331b170065e01a6a80ee05ed0c23.tar.gz llvm-f3cc4df51da4331b170065e01a6a80ee05ed0c23.tar.bz2 | |
Revert "[CMake] Simplify CMake handling for zlib"
This reverts commit 1adc494bce44f6004994deed61b30d4b71fe1d05.
This patch broke the Windows compilation on buildbot and pre-merge testing:
http://lab.llvm.org:8011/builders/mlir-windows/builds/5945
https://buildkite.com/llvm-project/llvm-master-build/builds/780
Diffstat (limited to 'llvm/lib/Support/Compression.cpp')
| -rw-r--r-- | llvm/lib/Support/Compression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Compression.cpp b/llvm/lib/Support/Compression.cpp index b8c77cf..27d92f0 100644 --- a/llvm/lib/Support/Compression.cpp +++ b/llvm/lib/Support/Compression.cpp @@ -17,13 +17,13 @@ #include "llvm/Support/Compiler.h" #include "llvm/Support/Error.h" #include "llvm/Support/ErrorHandling.h" -#if LLVM_ENABLE_ZLIB +#if LLVM_ENABLE_ZLIB == 1 && HAVE_ZLIB_H #include <zlib.h> #endif using namespace llvm; -#if LLVM_ENABLE_ZLIB +#if LLVM_ENABLE_ZLIB == 1 && HAVE_LIBZ static Error createError(StringRef Err) { return make_error<StringError>(Err, inconvertibleErrorCode()); } |