Skip to content

Commit 50e38cc

Browse files
authored
[CMake] Update CMake cache file for the ARM/Aarch64 cross toolchain builds. NFC. (#116744)
Forcely disable the libc++ benchmarks on Windows build hosts. The benchmark configuration currently does not support the cross builds on Windows hosts. Also removed unnecessary `CMAKE_CROSSCOMPILING` CMake option.
1 parent 1df1998 commit 50e38cc

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

clang/cmake/caches/CrossWinToARMLinux.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ if (NOT DEFINED CMAKE_BUILD_TYPE)
119119
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
120120
endif()
121121

122-
set(CMAKE_CROSSCOMPILING ON CACHE BOOL "")
123122
set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: " CACHE STRING "")
124123
# Required if COMPILER_RT_DEFAULT_TARGET_ONLY is ON
125124
set(CMAKE_C_COMPILER_TARGET "${TOOLCHAIN_TARGET_TRIPLE}" CACHE STRING "")
@@ -219,6 +218,11 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI
219218
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "")
220219
# Merge libc++ and libc++abi libraries into the single libc++ library file.
221220
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
221+
# Forcely disable the libc++ benchmarks on Windows build hosts
222+
# (current benchmark test configuration does not support the cross builds there).
223+
if (WIN32)
224+
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
225+
endif(WIN32)
222226

223227
# Avoid searching for the python3 interpreter during the runtimes configuration for the cross builds.
224228
# It starts searching the python3 package using the target's sysroot path, that usually is not compatible with the build host.

0 commit comments

Comments
 (0)