[Lldb-commits] [PATCH] D61877: [CMake] Add error to clarify that lldb requires libcxx

[J. Ryan Stinnett via Phabricator via lldb-commits]

jryans updated this revision to Diff 199394.
jryans added a comment.

Updated to support old project layout as well


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61877/new/

https://reviews.llvm.org/D61877

Files:
  lldb/CMakeLists.txt
  lldb/docs/resources/build.rst


Index: lldb/docs/resources/build.rst
===================================================================
--- lldb/docs/resources/build.rst
+++ lldb/docs/resources/build.rst
@@ -152,6 +152,12 @@
 LLVM, then you can pass LLVM-specific CMake variables to cmake when building
 LLDB.
 
+If you are building both Clang and LLDB together, be sure to also add libc++,
+which is currently required for testing on macOS:
+
+::
+
+  > cmake -D LLVM_ENABLE_PROJECTS='clang;lldb;libcxx' $PATH_TO_LLVM -G Ninja
 
 Here are some commonly used LLDB-specific CMake variables:
 
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ lldb/CMakeLists.txt
@@ -124,6 +124,24 @@
           message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
         endif()
       else()
+        # We require libcxx for the test suite, so if we aren't building it,
+        # try to provide a helpful error about how to resolve the situation.
+        if(NOT TARGET cxx)
+          if(LLVM_ENABLE_PROJECTS STREQUAL "")
+            # If `LLVM_ENABLE_PROJECTS` is not being used (implying that we are
+            # using the old layout), suggest checking it out.
+            message(FATAL_ERROR
+              "LLDB test suite requires libc++, but it is currently disabled. "
+              "Please checkout `libcxx` in `llvm/projects` or disable tests "
+              "via `LLDB_INCLUDE_TESTS=OFF`.")
+          else()
+            # If `LLVM_ENABLE_PROJECTS` is being used, suggest adding it.
+            message(FATAL_ERROR
+              "LLDB test suite requires libc++, but it is currently disabled. "
+              "Please add `libcxx` to `LLVM_ENABLE_PROJECTS` or disable tests "
+              "via `LLDB_INCLUDE_TESTS=OFF`.")
+          endif()
+        endif()
         list(APPEND LLDB_TEST_DEPS cxx)
       endif()
     endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61877.199394.patch
Type: text/x-patch
Size: 1945 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190514/7c45fd09/attachment-0001.bin>