Skip to content

Accommodate a clang hint-path #171

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
Aug 30, 2026
Merged

Accommodate a clang hint-path #171

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
20 changes: 16 additions & 4 deletions Windows.Clang.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
# | CMAKE_VS_VERSION_RANGE | A verson range for VS instances to find. For example, '[16.0,17.0)' will find versions '16.*'. Defaults to '[16.0,17.0)' |
# | CMAKE_WINDOWS_KITS_10_DIR | The location of the root of the Windows Kits 10 directory. |
# | TOOLCHAIN_ADD_VS_NINJA_PATH | Whether the toolchain should add the path to the VS Ninja to the CMAKE_SYSTEM_PROGRAM_PATH. Defaults to 'ON'. |
# | TOOLCHAIN_LLVM_HINT_PATH | A 'hint path' to LLVM. If set, it will be used to find clang/clang-cl in the 'bin' folder. |
# | TOOLCHAIN_UPDATE_PROGRAM_PATH | Whether the toolchain should update CMAKE_PROGRAM_PATH. Defaults to 'ON'. |
# | VS_INSTALLATION_PATH | The location of the root of the Visual Studio installation. If not specified VSWhere will be used to search for one. |
#
Expand Down Expand Up @@ -226,13 +227,24 @@ unset(TOOLCHAIN_TARGET)

# 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")
# The following paths are considered in order:
# 1) 'TOOLCHAIN_LLVM_HINT_PATH' if set.
# 2) '${VS_INSTALLATION_PATH}/VC/Tools/Llvm/arm64' if the host is ARM64.
# 3) '${VS_INSTALLATION_PATH}/VC/Tools/Llvm/x64'.
# 4) '$ENV{ProgramFiles}/LLVM'
#
set(TOOLCHAIN_CLANG_HINTS_PATHS)
if(TOOLCHAIN_LLVM_HINT_PATH)
list(APPEND TOOLCHAIN_CLANG_HINTS_PATHS "${TOOLCHAIN_LLVM_HINT_PATH}/bin")
endif()

if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL ARM64)
list(PREPEND TOOLCHAIN_CLANG_HINTS_PATHS "${VS_INSTALLATION_PATH}/VC/Tools/Llvm/arm64/bin")
list(APPEND TOOLCHAIN_CLANG_HINTS_PATHS "${VS_INSTALLATION_PATH}/VC/Tools/Llvm/arm64/bin")
endif()

list(APPEND TOOLCHAIN_CLANG_HINTS_PATHS "${VS_INSTALLATION_PATH}/VC/Tools/Llvm/x64/bin")
list(APPEND TOOLCHAIN_CLANG_HINTS_PATHS "$ENV{ProgramFiles}/LLVM/bin")

if(NOT CMAKE_C_COMPILER)
set(TOOLCHAIN_C_COMPILER_EXE clang.exe)
if(CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL MSVC)
Expand Down