Author: davide Date: Tue Apr 16 14:15:28 2019 New Revision: 358528 URL: http://llvm.org/viewvc/llvm-project?rev=358528&view=rev Log: [tools] Make vscode and lldb-instr optional.
Summary: Saves some build times, and they're not part of the usual developer workflow. Reviewers: JDevlieghere, friss Subscribers: mgorny, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D60780 Added: lldb/trunk/lit/tools/lldb-instr/lit.local.cfg Modified: lldb/trunk/cmake/modules/AddLLDB.cmake lldb/trunk/lit/CMakeLists.txt lldb/trunk/lit/lit.site.cfg.py.in lldb/trunk/tools/CMakeLists.txt Modified: lldb/trunk/cmake/modules/AddLLDB.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=358528&r1=358527&r2=358528&view=diff ============================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake (original) +++ lldb/trunk/cmake/modules/AddLLDB.cmake Tue Apr 16 14:15:28 2019 @@ -141,6 +141,11 @@ function(add_lldb_executable name) 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() Modified: lldb/trunk/lit/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=358528&r1=358527&r2=358528&view=diff ============================================================================== --- lldb/trunk/lit/CMakeLists.txt (original) +++ lldb/trunk/lit/CMakeLists.txt Tue Apr 16 14:15:28 2019 @@ -36,6 +36,8 @@ 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=358528&r1=358527&r2=358528&view=diff ============================================================================== --- lldb/trunk/lit/lit.site.cfg.py.in (original) +++ lldb/trunk/lit/lit.site.cfg.py.in Tue Apr 16 14:15:28 2019 @@ -18,6 +18,8 @@ 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@ config.maxIndividualTestTime = 600 # Support substitution of the tools and libs dirs with user parameters. This is Added: 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=358528&view=auto ============================================================================== --- lldb/trunk/lit/tools/lldb-instr/lit.local.cfg (added) +++ lldb/trunk/lit/tools/lldb-instr/lit.local.cfg Tue Apr 16 14:15:28 2019 @@ -0,0 +1,4 @@ +import sys + +if not config.have_lldb_instr: + config.unsupported = True Modified: lldb/trunk/tools/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/CMakeLists.txt?rev=358528&r1=358527&r2=358528&view=diff ============================================================================== --- lldb/trunk/tools/CMakeLists.txt (original) +++ lldb/trunk/tools/CMakeLists.txt Tue Apr 16 14:15:28 2019 @@ -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) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
