diff -rupN clang-tools-extra/clangd/CompileCommands.cpp clang-tools-extra.patched/clangd/CompileCommands.cpp
--- clang-tools-extra/clangd/CompileCommands.cpp	2026-05-04 23:50:13.000000000 +0100
+++ clang-tools-extra.patched/clangd/CompileCommands.cpp	2026-05-11 12:59:36.480246247 +0100
@@ -99,7 +99,8 @@ std::string detectClangPath() {
   // On Mac, `which clang` is /usr/bin/clang. It runs `xcrun clang`, which knows
   // where the real clang is kept. We need to do the same thing,
   // because cc1 (not the driver!) will find libc++ relative to argv[0].
-#ifdef __APPLE__
+//#ifdef __APPLE__
+#if 0
   if (auto MacClang = queryXcrun({"xcrun", "--find", "clang"}))
     return resolve(std::move(*MacClang));
 #endif
@@ -120,7 +121,8 @@ std::string detectClangPath() {
 // On mac, /usr/bin/clang sets SDKROOT and then invokes the real clang.
 // The effect of this is to set -isysroot correctly. We do the same.
 std::optional<std::string> detectSysroot() {
-#ifndef __APPLE__
+//#ifndef __APPLE__
+#if 1
   return std::nullopt;
 #endif
 
diff -rupN clang-tools-extra/clangd/tool/ClangdMain.cpp clang-tools-extra.patched/clangd/tool/ClangdMain.cpp
--- clang-tools-extra/clangd/tool/ClangdMain.cpp	2026-05-04 23:50:13.000000000 +0100
+++ clang-tools-extra.patched/clangd/tool/ClangdMain.cpp	2026-05-11 12:55:36.015423142 +0100
@@ -243,6 +243,13 @@ opt<std::string> FallbackStyle{
     init(clang::format::DefaultFallbackStyle),
 };
 
+opt<std::string> FormatStyle{
+    "style",
+    cat(Features),
+    desc(clang::format::StyleOptionHelpDescription),
+    init(clang::format::DefaultFormatStyle),
+};
+
 opt<std::string> EnableFunctionArgSnippets{
     "function-arg-placeholders",
     cat(Features),
@@ -827,6 +834,8 @@ clangd accepts flags on the commandline,
   }
   if (FallbackStyle.getNumOccurrences())
     clang::format::DefaultFallbackStyle = FallbackStyle.c_str();
+  if (FormatStyle.getNumOccurrences())
+    clang::format::DefaultFormatStyle = FormatStyle.c_str();
 
   // Validate command line arguments.
   std::optional<llvm::raw_fd_ostream> InputMirrorStream;