[PATCH] D98861: [CMAKE] Fix cross-compilation build

Vladislav Vinogradov via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 19 01:32:02 PDT 2021


vinograd47 updated this revision to Diff 331792.
vinograd47 edited the summary of this revision.
vinograd47 added a comment.

@zero9178 Applied your suggestion.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D98861

Files:
  llvm/CMakeLists.txt
  llvm/cmake/modules/GetErrcMessages.cmake


Index: llvm/cmake/modules/GetErrcMessages.cmake
===================================================================
--- llvm/cmake/modules/GetErrcMessages.cmake
+++ llvm/cmake/modules/GetErrcMessages.cmake
@@ -4,7 +4,6 @@
 # Messages are semi colon separated.
 # Keep amount, order and tested error codes in sync with llvm/utils/lit/lit/llvm/config.py.
 function(get_errc_messages outvar)
-
     set(errc_test_code ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/getErrc.cpp)
 
     file(WRITE ${errc_test_code} "
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -507,9 +507,6 @@
 endif()
 set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
 
-include(GetErrcMessages)
-get_errc_messages(LLVM_LIT_ERRC_MESSAGES)
-
 # On Win32 hosts, provide an option to specify the path to the GnuWin32 tools.
 if( WIN32 AND NOT CYGWIN )
   set(LLVM_LIT_TOOLS_DIR "" CACHE PATH "Path to GnuWin32 tools")
@@ -976,6 +973,10 @@
       NO_INSTALL
       ALWAYS_CLEAN)
   endif()
+
+  include(GetErrcMessages)
+  get_errc_messages(LLVM_LIT_ERRC_MESSAGES)
+
   add_subdirectory(utils/lit)
   add_subdirectory(test)
   add_subdirectory(unittests)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D98861.331792.patch
Type: text/x-patch
Size: 1255 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210319/3b7d77fb/attachment.bin>


More information about the llvm-commits mailing list