aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2018-01-24 20:26:12 +0000
committerDimitry Andric <dim@FreeBSD.org>2018-01-24 20:26:12 +0000
commita2cf70158c66891c9c041270b450e9699b0439fb (patch)
tree03cb951b1ed6d1c0eaea0b9ba0c298c18f2aecbc
parent4298ea0c0f4c4afb87fb28f496b3df781088b73c (diff)
downloadsrc-vendor/lldb/lldb-release_60-r323948.tar.gz
src-vendor/lldb/lldb-release_60-r323948.zip
-rw-r--r--lit/CMakeLists.txt4
-rw-r--r--lit/lit.cfg4
-rw-r--r--lit/lit.site.cfg.in2
3 files changed, 7 insertions, 3 deletions
diff --git a/lit/CMakeLists.txt b/lit/CMakeLists.txt
index 5488154318a9..03fe3d881e9c 100644
--- a/lit/CMakeLists.txt
+++ b/lit/CMakeLists.txt
@@ -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)
diff --git a/lit/lit.cfg b/lit/lit.cfg
index 402d03947ca8..4a190a7328ba 100644
--- a/lit/lit.cfg
+++ b/lit/lit.cfg
@@ -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
diff --git a/lit/lit.site.cfg.in b/lit/lit.site.cfg.in
index 2cfa677651a1..c6550877751f 100644
--- a/lit/lit.site.cfg.in
+++ b/lit/lit.site.cfg.in
@@ -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.