[llvm-branch-commits] [lldb] r322833 - Merging r322081:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 18 03:13:10 2018
New Revision: 322833

URL: http://llvm.org/viewvc/llvm-project?rev=322833&view=rev
Log:
Merging r322081:
------------------------------------------------------------------------
r322081 | mgorny | 2018-01-09 06:44:04 -0800 (Tue, 09 Jan 2018) | 10 lines

[test] Fix tests to use more portable LLVM_ENABLE_ZLIB

The HAVE_LIBZ variable is not exported by LLVM, and therefore is not
available in stand-alone builds of other tools. Use LLVM_ENABLE_ZLIB
which is the name under which the effective value is exported.

Additional, use llvm_canonicalize_cmake_booleans() to make sure that
a correct (Python-safe) boolean value is passed down to lit.

Differential Revision: https://reviews.llvm.org/D41725
------------------------------------------------------------------------

Modified:
    lldb/branches/release_60/   (props changed)
    lldb/branches/release_60/lit/CMakeLists.txt
    lldb/branches/release_60/lit/lit.site.cfg.in

Propchange: lldb/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 18 03:13:10 2018
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:321932
+/lldb/trunk:321932,322081

Modified: lldb/branches/release_60/lit/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_60/lit/CMakeLists.txt?rev=322833&r1=322832&r2=322833&view=diff
==============================================================================
--- lldb/branches/release_60/lit/CMakeLists.txt (original)
+++ lldb/branches/release_60/lit/CMakeLists.txt Thu Jan 18 03:13:10 2018
@@ -11,6 +11,10 @@ else()
   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)

Modified: lldb/branches/release_60/lit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_60/lit/lit.site.cfg.in?rev=322833&r1=322832&r2=322833&view=diff
==============================================================================
--- lldb/branches/release_60/lit/lit.site.cfg.in (original)
+++ lldb/branches/release_60/lit/lit.site.cfg.in Thu Jan 18 03:13:10 2018
@@ -12,7 +12,7 @@ config.target_triple = "@TARGET_TRIPLE@"
 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.