Revert 316150 which reinstated r316025.

It fails on some bots and now we know how to reproduce it.

llvm-svn: 316153

diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 16402e1..a1b4846 100644 (file)
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/cmake/config-ix.cmake
@@ -132,17 +132,7 @@ endif()
 # like strlen, leading to false positives.
 if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
   if (LLVM_ENABLE_ZLIB)
-    find_package(ZLIB)
-    if (ZLIB_FOUND)
-      set(HAVE_LIBZ 1)
-    else()
-      # Some LLVM bots do not have zlib in a standard location and rely on the
-      # compiler to find it.
-      check_library_exists(z compress2 "" HAVE_LIBZ)
-      if(HAVE_LIBZ)
-        set(ZLIB_LIBRARIES z)
-      endif()
-    endif()
+    check_library_exists(z compress2 "" HAVE_LIBZ)
   else()
     set(HAVE_LIBZ 0)
   endif()

diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index 5dcb5e5..56aaf10 100644 (file)
--- 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} ${ZLIB_LIBRARIES})
+    set(system_libs ${system_libs} z)
   endif()
   if( UNIX AND NOT (BEOS OR HAIKU) )
     set(system_libs ${system_libs} m)