[Lldb-commits] [PATCH] D61533: Make lldb-mi optional and change how we deal with missing tools in lit

[Jonas Devlieghere via Phabricator via lldb-commits]

JDevlieghere created this revision.
JDevlieghere added a reviewer: davide.
Herald added a subscriber: mgorny.

https://reviews.llvm.org/D61533

Files:
  lldb/lit/CMakeLists.txt
  lldb/lit/lit.site.cfg.py.in
  lldb/lit/tools/lldb-instr/lit.local.cfg
  lldb/tools/CMakeLists.txt


Index: lldb/tools/CMakeLists.txt
===================================================================
--- lldb/tools/CMakeLists.txt
+++ 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-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")
Index: lldb/lit/tools/lldb-instr/lit.local.cfg
===================================================================
--- lldb/lit/tools/lldb-instr/lit.local.cfg
+++ lldb/lit/tools/lldb-instr/lit.local.cfg
@@ -1,4 +1,2 @@
-import sys
-  
-if not config.have_lldb_instr:
+if not "lldb-inst" in config.available_features:
     config.unsupported = True
Index: lldb/lit/lit.site.cfg.py.in
===================================================================
--- lldb/lit/lit.site.cfg.py.in
+++ lldb/lit/lit.site.cfg.py.in
@@ -18,8 +18,6 @@
 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.
Index: lldb/lit/CMakeLists.txt
===================================================================
--- lldb/lit/CMakeLists.txt
+++ lldb/lit/CMakeLists.txt
@@ -37,8 +37,6 @@
 # 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)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61533.198074.patch
Type: text/x-patch
Size: 1961 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190503/6093c6c4/attachment.bin>