Commit abb00753 authored by Saleem Abdulrasool's avatar Saleem Abdulrasool
Browse files

build: reduce CMake handling for zlib 

Rather than handling zlib handling manually, use `find_package` from CMake
to find zlib properly. Use this to normalize the `LLVM_ENABLE_ZLIB`,
`HAVE_ZLIB`, `HAVE_ZLIB_H`. Furthermore, require zlib if `LLVM_ENABLE_ZLIB` is
set to `YES`, which requires the distributor to explicitly select whether
zlib is enabled or not. This simplifies the CMake handling and usage in
the rest of the tooling.

This restores 68a235d0,
e6c7ed6d.  The problem with the windows
bot is a need for clearing the cache.
parent aa17d31e

clang/test/CMakeLists.txt

+1 −10
Original line number Diff line number Diff line
@@ -9,22 +9,13 @@ endif () 


string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})



if(CLANG_BUILT_STANDALONE)

  # Set HAVE_LIBZ according to recorded LLVM_ENABLE_ZLIB value. This

  # value is forced to 0 if zlib was not found, so it is fine to use it

  # instead of HAVE_LIBZ (not recorded).

  if(LLVM_ENABLE_ZLIB)

    set(HAVE_LIBZ 1)

  endif()

endif()



llvm_canonicalize_cmake_booleans(

  CLANG_BUILD_EXAMPLES

  CLANG_ENABLE_ARCMT

  CLANG_ENABLE_STATIC_ANALYZER

  ENABLE_BACKTRACES

  ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER

  HAVE_LIBZ

  LLVM_ENABLE_ZLIB

  LLVM_ENABLE_PER_TARGET_RUNTIME_DIR

  LLVM_ENABLE_PLUGINS

  LLVM_ENABLE_THREADS)

clang/test/lit.site.cfg.py.in

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config.host_triple = "@LLVM_HOST_TRIPLE@" 
config.target_triple = "@TARGET_TRIPLE@"

config.host_cxx = "@CMAKE_CXX_COMPILER@"

config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"

config.have_zlib = @HAVE_LIBZ@

config.have_zlib = @LLVM_ENABLE_ZLIB@

config.clang_arcmt = @CLANG_ENABLE_ARCMT@

config.clang_default_cxx_stdlib = "@CLANG_DEFAULT_CXX_STDLIB@"

config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@

compiler-rt/test/lit.common.configured.in

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ if config.enable_per_target_runtime_dir: 
else:

  set_default("target_suffix", "-%s" % config.target_arch)



set_default("have_zlib", "@HAVE_LIBZ@")

set_default("have_zlib", "@LLVM_ENABLE_ZLIB@")

set_default("libcxx_used", "@LLVM_LIBCXX_USED@")



# LLVM tools dir can be passed in lit parameters, so try to

lld/test/CMakeLists.txt

+1 −10
Original line number Diff line number Diff line
@@ -4,17 +4,8 @@ set(LLVM_BUILD_MODE "%(build_mode)s") 
set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s")

set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/%(build_config)s")



if(LLD_BUILT_STANDALONE)

  # Set HAVE_LIBZ according to recorded LLVM_ENABLE_ZLIB value. This

  # value is forced to 0 if zlib was not found, so it is fine to use it

  # instead of HAVE_LIBZ (not recorded).

  if(LLVM_ENABLE_ZLIB)

    set(HAVE_LIBZ 1)

  endif()

endif()



llvm_canonicalize_cmake_booleans(

  HAVE_LIBZ

  LLVM_ENABLE_ZLIB

  LLVM_LIBXML2_ENABLED

  )

lld/test/lit.site.cfg.py.in

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@" 
config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"

config.target_triple = "@TARGET_TRIPLE@"

config.python_executable = "@PYTHON_EXECUTABLE@"

config.have_zlib = @HAVE_LIBZ@

config.have_zlib = @LLVM_ENABLE_ZLIB@

config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@



# Support substitution of the tools and libs dirs with user parameters. This is