[Lldb-commits] [PATCH] D56399: [CMake] Fix standalone builds: workaround the cxx target not getting imported yet (unlike clang target)

[Stefan Gränitz via Phabricator via lldb-commits]

sgraenitz created this revision.
sgraenitz added reviewers: aprantl, JDevlieghere.
Herald added a subscriber: mgorny.

Handle standalone builds separately and print a warning if we have no libcxx.


https://reviews.llvm.org/D56399

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -101,10 +101,22 @@
     list(APPEND LLDB_TEST_DEPS liblldb)
   endif()
 
+  # Add dependencies if we test with the in-tree clang.
+  # This works with standalone builds as they import the clang target.
   if(TARGET clang)
     list(APPEND LLDB_TEST_DEPS clang)
     if(APPLE)
-      list(APPEND LLDB_TEST_DEPS cxx)
+      # If we build clang, we should build libcxx.
+      # FIXME: Standalone builds should import the cxx target as well.
+      if(LLDB_BUILT_STANDALONE)
+        # For now check that the include directory exists.
+        set(cxx_dir "${LLVM_DIR}/../../../include/c++")
+        if(NOT EXISTS ${cxx_dir})
+          message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
+        endif()
+      else()
+        list(APPEND LLDB_TEST_DEPS cxx)
+      endif()
     endif()
   endif()
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56399.180523.patch
Type: text/x-patch
Size: 999 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190107/c4c0c640/attachment.bin>