[clang] efa5cad - [CMake] Update Cmake cache file for Win to ARM Linux cross builds. NFC
Vladimir Vereschaka via cfe-commits
cfe-commits at lists.llvm.org
Fri Oct 29 18:56:39 PDT 2021
Author: Vladimir Vereschaka
Date: 2021-10-29T18:55:49-07:00
New Revision: efa5cadcf7127558660a625766fd2f0fe417e98e
URL: https://github.com/llvm/llvm-project/commit/efa5cadcf7127558660a625766fd2f0fe417e98e
DIFF: https://github.com/llvm/llvm-project/commit/efa5cadcf7127558660a625766fd2f0fe417e98e.diff
LOG: [CMake] Update Cmake cache file for Win to ARM Linux cross builds. NFC
Workaround to fix broken remote execution for the libunwind tests.
https://reviews.llvm.org/D112082
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
################################################################################
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 63b49bc569ed0..f015c67e3b9ce 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -86,9 +86,9 @@ message(STATUS "Toolchain target triple: ${TARGET_TRIPLE}")
set(CMAKE_CROSSCOMPILING ON CACHE BOOL "")
set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: " CACHE STRING "")
# Required if COMPILER_RT_DEFAULT_TARGET_ONLY is ON
-set(CMAKE_C_COMPILER_TARGET "${TARGET_TRIPLE}" CACHE STRING "")
+set(CMAKE_C_COMPILER_TARGET "${TARGET_TRIPLE}" CACHE STRING "")
-set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "")
+set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "")
set(LLVM_DEFAULT_TARGET_TRIPLE "${TARGET_TRIPLE}" CACHE STRING "")
set(LLVM_TARGET_ARCH "${TARGET_TRIPLE}" CACHE STRING "")
set(LLVM_LIT_ARGS "-vv ${LLVM_LIT_ARGS}" CACHE STRING "" FORCE)
@@ -156,6 +156,9 @@ if(DEFINED REMOTE_TEST_HOST)
if(NOT DEFINED LIBUNWIND_EXECUTOR)
set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "")
endif()
+ #NOTE: temporary workaround to fix the remote execution for libunwind tests.
+ # https://reviews.llvm.org/D112082
+ set(LIBUNWIND_TEST_CONFIG "${LLVM_PROJECT_DIR}/libunwind/test/lit.site.cfg.in" CACHE PATH "")
if(NOT DEFINED LIBCXXABI_TARGET_INFO)
set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "")
endif()
More information about the cfe-commits
mailing list