Date: Wed, 24 Jan 2018 20:26:12 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r328372 - vendor/lldb/dist-release_60/lit Message-ID: <201801242026.w0OKQCmo043220@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Wed Jan 24 20:26:12 2018 New Revision: 328372 URL: https://svnweb.freebsd.org/changeset/base/328372 Log: Vendor import of lldb release_60 branch r323338: https://llvm.org/svn/llvm-project/lldb/branches/release_60@323338 Modified: vendor/lldb/dist-release_60/lit/CMakeLists.txt vendor/lldb/dist-release_60/lit/lit.cfg vendor/lldb/dist-release_60/lit/lit.site.cfg.in Modified: vendor/lldb/dist-release_60/lit/CMakeLists.txt ============================================================================== --- vendor/lldb/dist-release_60/lit/CMakeLists.txt Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/CMakeLists.txt Wed Jan 24 20:26:12 2018 (r328372) @@ -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: vendor/lldb/dist-release_60/lit/lit.cfg ============================================================================== --- vendor/lldb/dist-release_60/lit/lit.cfg Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/lit.cfg Wed Jan 24 20:26:12 2018 (r328372) @@ -91,11 +91,11 @@ for pattern in [r"\bFileCheck\b", pattern) tool_pipe = tool_match.group(2) tool_name = tool_match.group(4) - tool_path = lit.util.which(tool_name, config.llvm_tools_dir) + tool_path = lit.util.which(tool_name, config.environment['PATH']) if not tool_path: # Warn, but still provide a substitution. lit_config.note( - 'Did not find ' + tool_name + ' in ' + config.llvm_tools_dir) + 'Did not find ' + tool_name + ' in ' + config.environment['PATH']) config.substitutions.append((pattern, tool_pipe + tool_path)) # Shell execution Modified: vendor/lldb/dist-release_60/lit/lit.site.cfg.in ============================================================================== --- vendor/lldb/dist-release_60/lit/lit.site.cfg.in Wed Jan 24 20:26:08 2018 (r328371) +++ vendor/lldb/dist-release_60/lit/lit.site.cfg.in Wed Jan 24 20:26:12 2018 (r328372) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801242026.w0OKQCmo043220>