[Lldb-commits] [PATCH] D56389: [CMake] Fix standalone builds: make dependency to LLVM's `count` conditional

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

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

In standalone builds of LLDB we currently have no target `count` that tests can 
depend on. This may be fixed in the future by exporting the target from LLVM 
similar to targets llvm-config, dsymutil and others.

In-tree build with this patch:

  $ ninja -t query tools/lldb/lit/check-lldb-lit
  tools/lldb/lit/check-lldb-lit:
  input: phony
      tools/lldb/lit/CMakeFiles/check-lldb-lit
      bin/FileCheck
      bin/clang
      bin/count
      bin/darwin-debug
      bin/debugserver
      bin/dsymutil
      bin/llc
      bin/lldb
      bin/lldb-mi
      bin/lldb-server
      bin/lldb-test
      bin/llvm-config
      bin/llvm-mc
      bin/llvm-objcopy
      bin/not
      bin/yaml2obj
      lib/liblldb.dylib
      projects/libcxx/lib/cxx
      tools/lldb/unittests/LLDBUnitTests
  outputs:
      tools/lldb/test/check-lldb
      check-lldb-lit

Standalone build with this patch:

  $ ninja -t query lit/check-lldb-lit
  lit/check-lldb-lit:
  input: phony
      lit/CMakeFiles/check-lldb-lit
      bin/darwin-debug
      bin/debugserver
      bin/lldb
      bin/lldb-mi
      bin/lldb-server
      bin/lldb-test
      lib/liblldb.dylib
      unittests/LLDBUnitTests
  outputs:
      test/check-lldb
      check-lldb-lit


https://reviews.llvm.org/D56389

Files:
  lit/CMakeLists.txt


Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -26,7 +26,6 @@
 string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_ARGS 
"${LLDB_DOTEST_ARGS}")
 
 list(APPEND LLDB_TEST_DEPS
-  count
   LLDBUnitTests
   dsymutil
   llc
@@ -73,6 +72,7 @@
 if(NOT LLDB_BUILT_STANDALONE)
   list(APPEND LLDB_TEST_DEPS
     FileCheck
+    count
     not
     )
 endif()



Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -26,7 +26,6 @@
 string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
 
 list(APPEND LLDB_TEST_DEPS
-  count
   LLDBUnitTests
   dsymutil
   llc
@@ -73,6 +72,7 @@
 if(NOT LLDB_BUILT_STANDALONE)
   list(APPEND LLDB_TEST_DEPS
     FileCheck
+    count
     not
     )
 endif()

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits