diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/cmake/FindClang.cmake qt-creator-opensource-src-10.0.1-new/cmake/FindClang.cmake
--- qt-creator-opensource-src-10.0.1/cmake/FindClang.cmake	2023-05-04 04:05:51.000000000 +0200
+++ qt-creator-opensource-src-10.0.1-new/cmake/FindClang.cmake	2023-05-07 22:47:05.198957437 +0200
@@ -2,9 +2,16 @@ find_package(Clang CONFIG)
 
 option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO)
 
-set(CLANG_FORMAT_LIB clangFormat)
 if (TARGET clang-cpp AND CLANGTOOLING_LINK_CLANG_DYLIB)
   set(CLANG_FORMAT_LIB clang-cpp)
+else()
+  set(CLANG_FORMAT_INC_DIR "." CACHE STRING "Base path to clang includes")
+  set(CLANG_FORMAT_LIB_DIR "." CACHE STRING "Base path to clang libs")
+  foreach(lib in LIST clangFormat clangToolingCore clangRewrite clangLex clangBasic clangToolingInclusions)
+    add_library(${lib} STATIC IMPORTED)
+    set_property(TARGET ${lib} PROPERTY IMPORTED_LOCATION ${CLANG_FORMAT_LIB_DIR}/lib${lib}.a)
+  endforeach()
+  set(QTC_CLANG_BUILDMODE_MATCH ON)
 endif()
 
 if (WIN32 AND TARGET clangTooling)
diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/src/plugins/clangformat/CMakeLists.txt qt-creator-opensource-src-10.0.1-new/src/plugins/clangformat/CMakeLists.txt
--- qt-creator-opensource-src-10.0.1/src/plugins/clangformat/CMakeLists.txt	2023-05-04 04:05:53.000000000 +0200
+++ qt-creator-opensource-src-10.0.1-new/src/plugins/clangformat/CMakeLists.txt	2023-05-07 22:47:05.198957437 +0200
@@ -1,6 +1,6 @@
 add_qtc_plugin(ClangFormat
-  CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
-  DEPENDS Utils Qt::Widgets ${CLANG_FORMAT_LIB}
+  CONDITION TARGET clangFormat AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
+  DEPENDS Utils Qt::Widgets clangFormat clangToolingCore clangRewrite clangLex clangBasic clangToolingInclusions
   PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
   SOURCES
     clangformatbaseindenter.cpp clangformatbaseindenter.h
@@ -20,7 +20,7 @@ add_qtc_plugin(ClangFormat
 
 if(TARGET ClangFormat)
   # "system" includes, so warnings are ignored
-  target_include_directories(ClangFormat SYSTEM PRIVATE "${CLANG_INCLUDE_DIRS}")
+  target_include_directories(ClangFormat BEFORE PRIVATE "${CLANG_FORMAT_INC_DIR}")
 endif()
 
 if(MSVC AND TARGET ClangFormat)