diff options
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 5 | ||||
| -rw-r--r-- | llvm/lib/Support/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 7f33591de0c..c90f2d836c8 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -132,7 +132,10 @@ endif() # like strlen, leading to false positives. if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") if (LLVM_ENABLE_ZLIB) - check_library_exists(z compress2 "" HAVE_LIBZ) + find_package(ZLIB REQUIRED) + if (ZLIB_FOUND) + set(HAVE_LIBZ 1) + endif() else() set(HAVE_LIBZ 0) endif() diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index 56aaf10ec2c..5dcb5e58af4 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -22,7 +22,7 @@ elseif( CMAKE_HOST_UNIX ) endif() set(system_libs ${system_libs} ${LLVM_PTHREAD_LIB}) if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ ) - set(system_libs ${system_libs} z) + set(system_libs ${system_libs} ${ZLIB_LIBRARIES}) endif() if( UNIX AND NOT (BEOS OR HAIKU) ) set(system_libs ${system_libs} m) |
