https://github.com/vvereschaka created
https://github.com/llvm/llvm-project/pull/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.
>From 9fe3b6d922a72ff8fff4ec24bbc1b4b45e2130e8 Mon Sep 17 00:00:00 2001
From: Vladimir Vereschaka <vveresch...@accesssoftek.com>
Date: Mon, 18 Nov 2024 21:41:57 -0800
Subject: [PATCH] [CMake] Update CMake cache file for the ARM/Aarch64 cross
toolchain builds. NFC.
Forcly disable the libc++ benchmarks on Windows build hosts. The benchmark
configuration
currently does not support the cross builds on Windows hosts.
---
clang/cmake/caches/CrossWinToARMLinux.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 87118bbd33377d..64f9ae296ae51e 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -119,7 +119,6 @@ if (NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
endif()
-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 "${TOOLCHAIN_TARGET_TRIPLE}" CACHE
STRING "")
@@ -219,6 +218,11 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS
ON CACHE BOOL "")
# Merge libc++ and libc++abi libraries into the single libc++ library file.
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_STATIC_ABI_LIBRARY
ON CACHE BOOL "")
+# Forcly disable the libc++ benchmarks on Windows build hosts
+# (currently the benchmark test configuration does not support the cross
builds there).
+if (WIN32)
+ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_INCLUDE_BENCHMARKS
OFF CACHE BOOL "")
+endif(WIN32)
# Avoid searching for the python3 interpreter during the runtimes
configuration for the cross builds.
# It starts searching the python3 package using the target's sysroot path,
that usually is not compatible with the build host.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
