1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-cl: Link against clang_rt.builtins-x86_64.lib

Browse Source 
Fixes build with clang-cl on Windows.

This is a workaround for
https://github.com/llvm/llvm-project/issues/25679

Change-Id: I6dc8b045376101d8b8cc26fe5db3e7bf87a6a8f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Peter Varga 2024-06-13 16:07:53 +02:00
parent 9a11273b74
commit 7b049e1eb6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/CMakeLists.txt
View File

@ -843,12 +843,16 @@ qt_internal_extend_target(Core CONDITION WASM
text/qlocale_wasm.cpp text/qlocale_wasm.cpp
) )
# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it)
qt_internal_extend_target(Core CONDITION MSVC qt_internal_extend_target(Core CONDITION MSVC
LIBRARIES LIBRARIES
runtimeobject runtimeobject
) )
qt_internal_extend_target(Core CONDITION MSVC AND CLANG
LIBRARIES
clang_rt.builtins-x86_64
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_icu qt_internal_extend_target(Core CONDITION QT_FEATURE_icu
SOURCES SOURCES
text/qcollator_icu.cpp text/qcollator_icu.cpp

5
src/tools/bootstrap/CMakeLists.txt
View File

@ -133,6 +133,11 @@ qt_internal_extend_target(Bootstrap CONDITION WIN32
user32 user32
) )
qt_internal_extend_target(Bootstrap CONDITION MSVC AND CLANG
LIBRARIES
clang_rt.builtins-x86_64
)
qt_internal_extend_target(Bootstrap CONDITION APPLE qt_internal_extend_target(Bootstrap CONDITION APPLE
SOURCES SOURCES
../../corelib/global/qoperatingsystemversion.cpp ../../corelib/global/qoperatingsystemversion.cpp