diff options
| author | Pavel Labath <labath@google.com> | 2017-12-04 16:46:20 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-12-04 16:46:20 +0000 |
| commit | f2fdc183b7bb771acd44bc9433557f36479fff79 (patch) | |
| tree | 7480a355f982a2cfe174c8737e78d4e87384cd1b /llvm/lib | |
| parent | 5f7f32c3826ee3fd9b9bb4ff52543c881cde1e0f (diff) | |
| download | bcm5719-llvm-f2fdc183b7bb771acd44bc9433557f36479fff79.tar.gz bcm5719-llvm-f2fdc183b7bb771acd44bc9433557f36479fff79.zip | |
Revert "[cmake] Enable zlib support on windows"
This reverts commit r319533 as it broke llvm-config --system-libs output
and everything that depends on it (which is mostly out of tree or
downstream folks, but includes a couple of llvm buildbots as well).
I think I have a fix for this in D40779, but I want someone to look
review it first. In the mean time, I am reverting this change, as it
seems to break a lot of people.
llvm-svn: 319663
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Support/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index f2a59ec2743..5d95a9a9a56 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -1,7 +1,4 @@ set(system_libs) -if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ ) - set(system_libs ${system_libs} ${ZLIB_LIBRARY_PATH}) -endif() if( MSVC OR MINGW ) # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc. set(system_libs ${system_libs} psapi shell32 ole32 uuid) @@ -24,6 +21,9 @@ elseif( CMAKE_HOST_UNIX ) set(system_libs ${system_libs} atomic) endif() set(system_libs ${system_libs} ${LLVM_PTHREAD_LIB}) + if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ ) + set(system_libs ${system_libs} z) + endif() if( UNIX AND NOT (BEOS OR HAIKU) ) set(system_libs ${system_libs} m) endif() |
