[llvm] r316153 - Revert 316150 which reinstated r316025.

[Vassil Vassilev via llvm-commits]

Author: vvassilev
Date: Thu Oct 19 01:44:19 2017
New Revision: 316153

URL: http://llvm.org/viewvc/llvm-project?rev=316153&view=rev
Log:
Revert 316150 which reinstated r316025.

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

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/lib/Support/CMakeLists.txt

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=316153&r1=316152&r2=316153&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Thu Oct 19 01:44:19 2017
@@ -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()

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=316153&r1=316152&r2=316153&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Thu Oct 19 01:44:19 2017
@@ -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)