Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -141,6 +141,11 @@
   endif()
 endfunction(add_lldb_executable)
 
+
+macro(add_lldb_tool_subdirectory name)
+  add_llvm_subdirectory(LLDB TOOL ${name})
+endmacro()
+
 function(add_lldb_tool name)
   add_lldb_executable(${name} GENERATE_INSTALL ${ARGN})
 endfunction()
Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -36,6 +36,8 @@
 # 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)
 
Index: lit/lit.site.cfg.py.in
===================================================================
--- lit/lit.site.cfg.py.in
+++ lit/lit.site.cfg.py.in
@@ -18,6 +18,8 @@
 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@
 config.maxIndividualTestTime = 600
 
 # Support substitution of the tools and libs dirs with user parameters. This is
Index: lit/tools/lldb-instr/lit.local.cfg
===================================================================
--- lit/tools/lldb-instr/lit.local.cfg
+++ lit/tools/lldb-instr/lit.local.cfg
@@ -0,0 +1,4 @@
+import sys
+  
+if not config.have_lldb_instr:
+    config.unsupported = True
Index: tools/CMakeLists.txt
===================================================================
--- tools/CMakeLists.txt
+++ tools/CMakeLists.txt
@@ -1,10 +1,11 @@
 add_subdirectory(argdumper)
 add_subdirectory(driver)
 add_subdirectory(intel-features)
-add_subdirectory(lldb-instr)
 add_subdirectory(lldb-mi)
 add_subdirectory(lldb-test)
-add_subdirectory(lldb-vscode)
+
+add_lldb_tool_subdirectory(lldb-instr)
+add_lldb_tool_subdirectory(lldb-vscode)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_subdirectory(darwin-debug)