Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 07:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Fixes for clang-cl build

Browse source 
- User lib.exe instead of llvm-lib due to incompatibility
- Avoid wrapping resource compiler with cmcldeps
- Fix several conditional flags
This commit is contained in:
Victor Perevertkin 2021-09-13 23:39:03 +03:00
parent d74eb54b06
commit 62d1a2c884
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
toolchain-msvc.cmake
View file

@ -24,6 +24,10 @@ if(USE_CLANG_CL)
set(CMAKE_CXX_COMPILER clang-cl)
# Clang now defaults to lld-link which we're not compatible with yet
set(CMAKE_LINKER link)
# llvm-lib with link.exe can't generate proper delayed imports
set(CMAKE_AR lib)
set(CMAKE_C_COMPILER_AR lib)
set(CMAKE_CXX_COMPILER_AR lib)
# Explicitly set target so CMake doesn't get confused
if (ARCH STREQUAL "amd64")
set(CMAKE_C_COMPILER_TARGET "x86_64-pc-windows-msvc")
@ -38,6 +42,11 @@ if(USE_CLANG_CL)
set(CMAKE_C_COMPILER_TARGET "i686-pc-windows-msvc")
set(CMAKE_CXX_COMPILER_TARGET "i686-pc-windows-msvc")
endif()
# Avoid wrapping RC compiler with cmcldeps utility for clang-cl.
# Otherwise it breaks cross-compilation (32bit ReactOS cannot be compiled by 64bit LLVM),
# target architecture is not passed properly
set(CMAKE_NINJA_CMCLDEPS_RC OFF)
else()
set(CMAKE_C_COMPILER cl)
set(CMAKE_CXX_COMPILER cl)