summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2020-01-01 15:01:04 -0800
committerSaleem Abdulrasool <compnerd@compnerd.org>2020-01-01 16:36:59 -0800
commit68a235d07f9e7049c7eb0c8091f37e385327ac28 (patch)
treed532974d63227ba809d1bbe1472a7001a422cb3a /compiler-rt
parenteeef50b1fee91dbe993187324003d2665ceae331 (diff)
downloadbcm5719-llvm-68a235d07f9e7049c7eb0c8091f37e385327ac28.tar.gz
bcm5719-llvm-68a235d07f9e7049c7eb0c8091f37e385327ac28.zip
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.
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/test/lit.common.configured.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index b4862f74cdd..0fb51741783 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -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
OpenPOWER on IntegriCloud