Author: jdevlieghere Date: Fri May 3 13:33:58 2019 New Revision: 359926 URL: http://llvm.org/viewvc/llvm-project?rev=359926&view=rev Log: 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 Modified: lldb/trunk/lit/CMakeLists.txt lldb/trunk/lit/lit.site.cfg.py.in lldb/trunk/lit/tools/lldb-instr/lit.local.cfg lldb/trunk/tools/CMakeLists.txt Modified: lldb/trunk/lit/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=359926&r1=359925&r2=359926&view=diff ============================================================================== --- lldb/trunk/lit/CMakeLists.txt (original) +++ lldb/trunk/lit/CMakeLists.txt Fri May 3 13:33:58 2019 @@ -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) Modified: lldb/trunk/lit/lit.site.cfg.py.in URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit.site.cfg.py.in?rev=359926&r1=359925&r2=359926&view=diff ============================================================================== --- lldb/trunk/lit/lit.site.cfg.py.in (original) +++ lldb/trunk/lit/lit.site.cfg.py.in Fri May 3 13:33:58 2019 @@ -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. Modified: lldb/trunk/lit/tools/lldb-instr/lit.local.cfg URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/tools/lldb-instr/lit.local.cfg?rev=359926&r1=359925&r2=359926&view=diff ============================================================================== --- lldb/trunk/lit/tools/lldb-instr/lit.local.cfg (original) +++ lldb/trunk/lit/tools/lldb-instr/lit.local.cfg Fri May 3 13:33:58 2019 @@ -1,4 +1,2 @@ -import sys - -if not config.have_lldb_instr: +if not "lldb-instr" in config.available_features: config.unsupported = True Modified: lldb/trunk/tools/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/CMakeLists.txt?rev=359926&r1=359925&r2=359926&view=diff ============================================================================== --- lldb/trunk/tools/CMakeLists.txt (original) +++ lldb/trunk/tools/CMakeLists.txt Fri May 3 13:33:58 2019 @@ -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") _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
