From 7b049e1eb603f564df3c0a907c0095ee59318732 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 13 Jun 2024 16:07:53 +0200 Subject: [PATCH] clang-cl: Link against clang_rt.builtins-x86_64.lib 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 --- src/corelib/CMakeLists.txt | 6 +++++- src/tools/bootstrap/CMakeLists.txt | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index b4e4cd2c7d8..d18bee4feb5 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -843,12 +843,16 @@ qt_internal_extend_target(Core CONDITION WASM 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 LIBRARIES 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 SOURCES text/qcollator_icu.cpp diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index ad95d77d00e..c61eb45ba30 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -133,6 +133,11 @@ qt_internal_extend_target(Bootstrap CONDITION WIN32 user32 ) +qt_internal_extend_target(Bootstrap CONDITION MSVC AND CLANG + LIBRARIES + clang_rt.builtins-x86_64 +) + qt_internal_extend_target(Bootstrap CONDITION APPLE SOURCES ../../corelib/global/qoperatingsystemversion.cpp