Skip to content

Prefer the arm64 Visual Studio clang on ARM64 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkSchofield merged 1 commit into from
Mar 8, 2026
Merged

Prefer the arm64 Visual Studio clang on ARM64 #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Windows.Clang.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@ foreach(LANG C CXX)
endif()
endforeach()

# Look for clang/clang-cl.
#
# The Visual Studio-distributed clang tools are preferred, followed by the default installation location.
set(TOOLCHAIN_CLANG_HINTS_PATHS "$ENV{ProgramFiles}/LLVM/bin")
list(PREPEND TOOLCHAIN_CLANG_HINTS_PATHS "${VS_INSTALLATION_PATH}/VC/Tools/Llvm/x64/bin")
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL ARM64)
list(PREPEND TOOLCHAIN_CLANG_HINTS_PATHS "${VS_INSTALLATION_PATH}/VC/Tools/Llvm/arm64/bin")
endif()

if(NOT CMAKE_C_COMPILER)
set(TOOLCHAIN_C_COMPILER_EXE clang.exe)
if(CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL MSVC)
Expand All @@ -222,8 +231,7 @@ if(NOT CMAKE_C_COMPILER)
find_program(CMAKE_C_COMPILER
${TOOLCHAIN_C_COMPILER_EXE}
HINTS
"${VS_INSTALLATION_PATH}/VC/Tools/Llvm/x64/bin"
"$ENV{ProgramFiles}/LLVM/bin"
${TOOLCHAIN_CLANG_HINTS_PATHS}
REQUIRED
)
endif()
Expand All @@ -237,11 +245,11 @@ if(NOT CMAKE_CXX_COMPILER)
find_program(CMAKE_CXX_COMPILER
${TOOLCHAIN_CXX_COMPILER_EXE}
HINTS
"${VS_INSTALLATION_PATH}/VC/Tools/Llvm/x64/bin"
"$ENV{ProgramFiles}/LLVM/bin"
${TOOLCHAIN_CLANG_HINTS_PATHS}
REQUIRED
)
endif()
unset(TOOLCHAIN_CLANG_HINTS_PATHS)

if(CMAKE_SYSTEM_PROCESSOR STREQUAL ARM)
set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} /EHsc")
Expand Down