Date: Tue, 5 Feb 2019 18:40:12 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r343804 - in vendor/lldb/dist-release_80: cmake/modules lit source/Plugins/Process/NetBSD Message-ID: <201902051840.x15IeCnN063846@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Feb 5 18:40:11 2019 New Revision: 343804 URL: https://svnweb.freebsd.org/changeset/base/343804 Log: Vendor import of lldb release_80 branch r353167: https://llvm.org/svn/llvm-project/lldb/branches/release_80@353167 Modified: vendor/lldb/dist-release_80/cmake/modules/AddLLDB.cmake vendor/lldb/dist-release_80/cmake/modules/LLDBStandalone.cmake vendor/lldb/dist-release_80/lit/CMakeLists.txt vendor/lldb/dist-release_80/source/Plugins/Process/NetBSD/CMakeLists.txt Modified: vendor/lldb/dist-release_80/cmake/modules/AddLLDB.cmake ============================================================================== --- vendor/lldb/dist-release_80/cmake/modules/AddLLDB.cmake Tue Feb 5 18:40:07 2019 (r343803) +++ vendor/lldb/dist-release_80/cmake/modules/AddLLDB.cmake Tue Feb 5 18:40:11 2019 (r343804) @@ -88,7 +88,9 @@ function(add_lldb_library name) # Hack: only some LLDB libraries depend on the clang autogenerated headers, # but it is simple enough to make all of LLDB depend on some of those # headers without negatively impacting much of anything. - add_dependencies(${name} clang-tablegen-targets) + if(NOT LLDB_BUILT_STANDALONE) + add_dependencies(${name} clang-tablegen-targets) + endif() # Add in any extra C++ compilation flags for this library. target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS}) Modified: vendor/lldb/dist-release_80/cmake/modules/LLDBStandalone.cmake ============================================================================== --- vendor/lldb/dist-release_80/cmake/modules/LLDBStandalone.cmake Tue Feb 5 18:40:07 2019 (r343803) +++ vendor/lldb/dist-release_80/cmake/modules/LLDBStandalone.cmake Tue Feb 5 18:40:11 2019 (r343804) @@ -58,7 +58,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR set(LLVM_DIR ${LLVM_OBJ_ROOT}/cmake/modules/CMakeFiles CACHE PATH "Path to LLVM build tree CMake files") set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") - set(LLVM_EXTERNAL_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit CACHE PATH "Path to llvm-lit") + set(LLVM_DEFAULT_EXTERNAL_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit CACHE PATH "Path to llvm-lit") find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) Modified: vendor/lldb/dist-release_80/lit/CMakeLists.txt ============================================================================== --- vendor/lldb/dist-release_80/lit/CMakeLists.txt Tue Feb 5 18:40:07 2019 (r343803) +++ vendor/lldb/dist-release_80/lit/CMakeLists.txt Tue Feb 5 18:40:11 2019 (r343804) @@ -26,9 +26,6 @@ list(APPEND LLDB_TEST_DEPS llvm-config llvm-mc llvm-objcopy - FileCheck - count - not ) if(TARGET lld) @@ -54,6 +51,14 @@ configure_lit_site_cfg( configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg) + +if(NOT LLDB_BUILT_STANDALONE) + list(APPEND LLDB_TEST_DEPS + FileCheck + count + not + ) +endif() add_lit_testsuite(check-lldb-lit "Running lldb lit test suite" ${CMAKE_CURRENT_BINARY_DIR} Modified: vendor/lldb/dist-release_80/source/Plugins/Process/NetBSD/CMakeLists.txt ============================================================================== --- vendor/lldb/dist-release_80/source/Plugins/Process/NetBSD/CMakeLists.txt Tue Feb 5 18:40:07 2019 (r343803) +++ vendor/lldb/dist-release_80/source/Plugins/Process/NetBSD/CMakeLists.txt Tue Feb 5 18:40:11 2019 (r343804) @@ -11,6 +11,7 @@ add_lldb_library(lldbPluginProcessNetBSD PLUGIN lldbUtility lldbPluginProcessPOSIX lldbPluginProcessUtility + util LINK_COMPONENTS Support )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902051840.x15IeCnN063846>