diff options
| author | James Henderson <jh7370@my.bristol.ac.uk> | 2020-01-02 15:35:22 +0000 |
|---|---|---|
| committer | James Henderson <jh7370@my.bristol.ac.uk> | 2020-01-02 16:02:10 +0000 |
| commit | e406cca5f9a6477c9861717f81c156aa83feeaca (patch) | |
| tree | 59444cab919ea20ae0b9d754093c058fb12c1edb /llvm/lib/Support/Compression.cpp | |
| parent | 34397b75609c09c1723cd6c0b27f8f13c641ce4c (diff) | |
| download | llvm-e406cca5f9a6477c9861717f81c156aa83feeaca.zip llvm-e406cca5f9a6477c9861717f81c156aa83feeaca.tar.gz llvm-e406cca5f9a6477c9861717f81c156aa83feeaca.tar.bz2 | |
Revert "build: reduce CMake handling for zlib"
This reverts commit 68a235d07f9e7049c7eb0c8091f37e385327ac28.
This commit broke the clang-x64-windows-msvc build bot and a follow-up
commit did not fix it. Reverting to fix the bot.
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 4165a27..97d5ffa 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()); } |