diff options
| -rw-r--r-- | lldb/lit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/lit/lit.site.cfg.py.in | 2 | ||||
| -rw-r--r-- | lldb/lit/tools/lldb-instr/lit.local.cfg | 4 | ||||
| -rw-r--r-- | lldb/tools/CMakeLists.txt | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt index e5b6249ea1b..902f5d08615 100644 --- a/lldb/lit/CMakeLists.txt +++ b/lldb/lit/CMakeLists.txt @@ -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) diff --git a/lldb/lit/lit.site.cfg.py.in b/lldb/lit/lit.site.cfg.py.in index 623ff4cd662..738b25d0931 100644 --- a/lldb/lit/lit.site.cfg.py.in +++ b/lldb/lit/lit.site.cfg.py.in @@ -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. diff --git a/lldb/lit/tools/lldb-instr/lit.local.cfg b/lldb/lit/tools/lldb-instr/lit.local.cfg index fa6502c936b..0389218d7a6 100644 --- a/lldb/lit/tools/lldb-instr/lit.local.cfg +++ b/lldb/lit/tools/lldb-instr/lit.local.cfg @@ -1,4 +1,2 @@ -import sys - -if not config.have_lldb_instr: +if not "lldb-instr" in config.available_features: config.unsupported = True diff --git a/lldb/tools/CMakeLists.txt b/lldb/tools/CMakeLists.txt index ee8b65fe0e6..558ef46459c 100644 --- a/lldb/tools/CMakeLists.txt +++ b/lldb/tools/CMakeLists.txt @@ -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") |
