mgorny updated this revision to Diff 128883.
mgorny retitled this revision from "[lldb] [test] Fix missing HAVE_LIBZ for
tests in stand-alone builds" to "[lldb] [test] Fix tests to use more portable
LLVM_ENABLE_ZLIB".
mgorny edited the summary of this revision.
mgorny added a comment.
Updated the patch to use LLVM_ENABLE_ZLIB directly.
https://reviews.llvm.org/D41725
Files:
lit/CMakeLists.txt
lit/lit.site.cfg.in
Index: lit/lit.site.cfg.in
===================================================================
--- lit/lit.site.cfg.in
+++ lit/lit.site.cfg.in
@@ -12,7 +12,7 @@
config.python_executable = "@PYTHON_EXECUTABLE@"
config.cc = "@LLDB_TEST_C_COMPILER@"
config.cxx = "@LLDB_TEST_CXX_COMPILER@"
-config.have_zlib = @HAVE_LIBZ@
+config.have_zlib = @LLVM_ENABLE_ZLIB@
# Support substitution of the tools and libs dirs with user parameters. This is
# used when we can't determine the tool dir at configuration time.
Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -11,6 +11,10 @@
set(ENABLE_SHARED 0)
endif(BUILD_SHARED_LIBS)
+# the value is not canonicalized within LLVM
+llvm_canonicalize_cmake_booleans(
+ LLVM_ENABLE_ZLIB)
+
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
Index: lit/lit.site.cfg.in
===================================================================
--- lit/lit.site.cfg.in
+++ lit/lit.site.cfg.in
@@ -12,7 +12,7 @@
config.python_executable = "@PYTHON_EXECUTABLE@"
config.cc = "@LLDB_TEST_C_COMPILER@"
config.cxx = "@LLDB_TEST_CXX_COMPILER@"
-config.have_zlib = @HAVE_LIBZ@
+config.have_zlib = @LLVM_ENABLE_ZLIB@
# Support substitution of the tools and libs dirs with user parameters. This is
# used when we can't determine the tool dir at configuration time.
Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -11,6 +11,10 @@
set(ENABLE_SHARED 0)
endif(BUILD_SHARED_LIBS)
+# the value is not canonicalized within LLVM
+llvm_canonicalize_cmake_booleans(
+ LLVM_ENABLE_ZLIB)
+
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
