File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -119,7 +119,6 @@ if (NOT DEFINED CMAKE_BUILD_TYPE)
119119 set (CMAKE_BUILD_TYPE "Release" CACHE STRING "" )
120120endif ()
121121
122- set (CMAKE_CROSSCOMPILING ON CACHE BOOL "" )
123122set (CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: " CACHE STRING "" )
124123# Required if COMPILER_RT_DEFAULT_TARGET_ONLY is ON
125124set (CMAKE_C_COMPILER_TARGET "${TOOLCHAIN_TARGET_TRIPLE} " CACHE STRING "" )
@@ -219,6 +218,11 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI
219218set (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.
221220set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE} _LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "" )
221+ # Forcly disable the libc++ benchmarks on Windows build hosts
222+ # (currently the 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.
You can’t perform that action at this time.
0 commit comments