[PATCH] D79144: [CMake] Provide a proper default location for llvm-lit for out-of-tree users on Windows host.

[Vlad Vereschaka via Phabricator via llvm-commits]

vvereschaka created this revision.
vvereschaka added a reviewer: stephenneuendorffer.
vvereschaka added a project: LLVM.
Herald added subscribers: llvm-commits, mgorny.
vvereschaka added a comment.

also we get the following cmake warning during the build

  CMake Warning at C:/buildbot/as-builder-1/llvm-clang-win-x-armv7l/llvm-project/llvm/cmake/modules/AddLLVM.cmake:1638 (message):
    LLVM_EXTERNAL_LIT set to
    C:/buildbot/as-builder-1/llvm-clang-win-x-armv7l/build/./bin/llvm-lit, but
    the path does not exist.
  Call Stack (most recent call first):
    C:/buildbot/as-builder-1/llvm-clang-win-x-armv7l/llvm-project/llvm/cmake/modules/AddLLVM.cmake:1682 (get_llvm_lit_path)
    C:/buildbot/as-builder-1/llvm-clang-win-x-armv7l/llvm-project/llvm/cmake/modules/AddLLVM.cmake:1727 (add_lit_target)
    C:/buildbot/as-builder-1/llvm-clang-win-x-armv7l/llvm-project/libunwind/test/CMakeLists.txt:33 (add_lit_testsuite)

(http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/7142/steps/build-llvm-project/logs/stdio)


llvm-lit gets '.py' extension on Windows host during its configuration. We need to provide a correct name for llvm-lit including file extension within LLVM_CONFIG_DEFAULT_EXTERNAL_LIT variable.

      

Update for commit 45526d29a5b2cf126b83ada3991921970007d16f <https://reviews.llvm.org/rG45526d29a5b2cf126b83ada3991921970007d16f>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D79144

Files:
  llvm/cmake/modules/CMakeLists.txt


Index: llvm/cmake/modules/CMakeLists.txt
===================================================================
--- llvm/cmake/modules/CMakeLists.txt
+++ llvm/cmake/modules/CMakeLists.txt
@@ -56,7 +56,11 @@
 
 # Generate a default location for lit
 if (LLVM_BUILD_UTILS)
-  set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit")
+  if (CMAKE_HOST_WIN32 AND NOT CYGWIN)
+    set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit.py")
+  else()
+    set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit")
+  endif()
 endif()
 
 if (LLVM_LINK_LLVM_DYLIB)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79144.261086.patch
Type: text/x-patch
Size: 626 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200429/0b3ec364/attachment.bin>