Make lldb-mi optional and change how we deal with missing tools in lit
We don't need the variables in lit, we can use the capabilities to check if the utility exists. Differential revision: https://reviews.llvm.org/D61533 llvm-svn: 359926
This commit is contained in:
parent
80b047ef66
commit
c1e2c5340b
|
@ -37,8 +37,6 @@ endif()
|
|||
# the value is not canonicalized within LLVM
|
||||
llvm_canonicalize_cmake_booleans(
|
||||
LLDB_DISABLE_PYTHON
|
||||
LLDB_TOOL_LLDB_INSTR_BUILD
|
||||
LLDB_TOOL_LLDB_VSCODE_BUILD
|
||||
LLVM_ENABLE_ZLIB
|
||||
LLDB_IS_64_BITS)
|
||||
|
||||
|
|
|
@ -18,8 +18,6 @@ config.have_zlib = @LLVM_ENABLE_ZLIB@
|
|||
config.host_triple = "@LLVM_HOST_TRIPLE@"
|
||||
config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
|
||||
config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
|
||||
config.have_lldb_instr = @LLDB_TOOL_LLDB_INSTR_BUILD@
|
||||
config.have_lldb_vscode = @LLDB_TOOL_LLDB_VSCODE_BUILD@
|
||||
|
||||
# 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.
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
import sys
|
||||
|
||||
if not config.have_lldb_instr:
|
||||
if not "lldb-instr" in config.available_features:
|
||||
config.unsupported = True
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
add_subdirectory(argdumper)
|
||||
add_subdirectory(driver)
|
||||
add_subdirectory(intel-features)
|
||||
add_subdirectory(lldb-mi)
|
||||
|
||||
# We want lldb-test to be built only when it's needed,
|
||||
# i.e. if a target requires it as dependency. The typical
|
||||
|
@ -9,6 +8,7 @@ add_subdirectory(lldb-mi)
|
|||
add_subdirectory(lldb-test EXCLUDE_FROM_ALL)
|
||||
|
||||
add_lldb_tool_subdirectory(lldb-instr)
|
||||
add_lldb_tool_subdirectory(lldb-mi)
|
||||
add_lldb_tool_subdirectory(lldb-vscode)
|
||||
|
||||
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
|
|
Loading…
Reference in New Issue