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