RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

Revert 316150 which reinstated r316025.

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

llvm-svn: 316153
This commit is contained in:
Vassil Vassilev 2017-10-19 08:44:19 +00:00
parent c45bdbcd89
commit c8fa84aa94
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/config-ix.cmake
View File

@ -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()

2
lib/Support/CMakeLists.txt
View File

@ -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)