aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-02-05 18:40:11 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-02-05 18:40:11 +0000
commit012155a8760772089d507063b47b7f4c911a782b (patch)
tree6d81befb132c42beb03a6aa7655777b6e3b1610a
parent38e660c46fb9f2b2a33b2f771dc8777d50ace53a (diff)
downloadsrc-012155a8760772089d507063b47b7f4c911a782b.tar.gz
src-012155a8760772089d507063b47b7f4c911a782b.zip
Vendor import of lldb release_80 branch r353167:vendor/lldb/lldb-release_80-r354130vendor/lldb/lldb-release_80-r353167
Notes
Notes: svn path=/vendor/lldb/dist-release_80/; revision=343804 svn path=/vendor/lldb/lldb-release_80-r354130/; revision=344175; tag=vendor/lldb/lldb-release_80-r354130
-rw-r--r--cmake/modules/AddLLDB.cmake4
-rw-r--r--cmake/modules/LLDBStandalone.cmake2
-rw-r--r--lit/CMakeLists.txt11
-rw-r--r--source/Plugins/Process/NetBSD/CMakeLists.txt1
4 files changed, 13 insertions, 5 deletions
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index f7cac3dad837..f82c11d3d317 100644
--- a/cmake/modules/AddLLDB.cmake
+++ b/cmake/modules/AddLLDB.cmake
@@ -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})
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index e63b2694e6a4..a9059dd5f9eb 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -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)
diff --git a/lit/CMakeLists.txt b/lit/CMakeLists.txt
index 1ac013b2eed3..804e950b3bb0 100644
--- a/lit/CMakeLists.txt
+++ b/lit/CMakeLists.txt
@@ -26,9 +26,6 @@ list(APPEND LLDB_TEST_DEPS
llvm-config
llvm-mc
llvm-objcopy
- FileCheck
- count
- not
)
if(TARGET lld)
@@ -55,6 +52,14 @@ 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}
DEPENDS ${LLDB_TEST_DEPS}
diff --git a/source/Plugins/Process/NetBSD/CMakeLists.txt b/source/Plugins/Process/NetBSD/CMakeLists.txt
index e131e6d70468..586725bb7a56 100644
--- a/source/Plugins/Process/NetBSD/CMakeLists.txt
+++ b/source/Plugins/Process/NetBSD/CMakeLists.txt
@@ -11,6 +11,7 @@ add_lldb_library(lldbPluginProcessNetBSD PLUGIN
lldbUtility
lldbPluginProcessPOSIX
lldbPluginProcessUtility
+ util
LINK_COMPONENTS
Support
)