From 4dfe43b3e3b89ac4d52bb26aea779c670ee70cd1 Mon Sep 17 00:00:00 2001 From: Damyan Pepper Date: Thu, 30 Oct 2025 20:38:07 -0700 Subject: [PATCH 1/2] Use CMAKE_C_COMPILER_ARCHITECTURE_ID (cherry picked from commit a58ba31ec246544ab0e9913708bd4d22cfcc92f6) --- tools/clang/test/taef_exec/DownloadWarp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/clang/test/taef_exec/DownloadWarp.cmake b/tools/clang/test/taef_exec/DownloadWarp.cmake index b8d1a49ba3..f2245cebfa 100644 --- a/tools/clang/test/taef_exec/DownloadWarp.cmake +++ b/tools/clang/test/taef_exec/DownloadWarp.cmake @@ -76,7 +76,7 @@ endif() set(WARP_DIR ${CMAKE_BINARY_DIR}/nuget/${WARP_PACKAGE}) -if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64") +if((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64")) OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM64")) set(WARP_ARCH "arm64") elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "X86")) set(WARP_ARCH "win32") From c6516464c04673a829bfa2eb393c3abffbccc1dc Mon Sep 17 00:00:00 2001 From: Damyan Pepper Date: Thu, 30 Oct 2025 20:49:22 -0700 Subject: [PATCH 2/2] Fix (cherry picked from commit 3721773c046de5af04a92d8e67ea8bd8bfa8da99) --- tools/clang/test/taef_exec/DownloadWarp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/clang/test/taef_exec/DownloadWarp.cmake b/tools/clang/test/taef_exec/DownloadWarp.cmake index f2245cebfa..5e599695f5 100644 --- a/tools/clang/test/taef_exec/DownloadWarp.cmake +++ b/tools/clang/test/taef_exec/DownloadWarp.cmake @@ -76,7 +76,7 @@ endif() set(WARP_DIR ${CMAKE_BINARY_DIR}/nuget/${WARP_PACKAGE}) -if((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64")) OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM64")) +if((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM64")) set(WARP_ARCH "arm64") elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "X86")) set(WARP_ARCH "win32")