Index: clangd/ClangdServer.cpp
===================================================================
--- clangd/ClangdServer.cpp
+++ clangd/ClangdServer.cpp
@@ -448,7 +448,8 @@
 
   // Inject the resource dir.
   // FIXME: Don't overwrite it if it's already there.
-  C->CommandLine.push_back("-resource-dir=" + ResourceDir);
+  if (!ResourceDir.empty())
+    C->CommandLine.push_back("-resource-dir=" + ResourceDir);
   return std::move(*C);
 }
 
Index: clangd/tool/ClangdMain.cpp
===================================================================
--- clangd/tool/ClangdMain.cpp
+++ clangd/tool/ClangdMain.cpp
@@ -340,7 +340,7 @@
     Opts.StorePreamblesInMemory = false;
     break;
   }
-  if (!ResourceDir.empty())
+  if (ResourceDir.getNumOccurrences() > 0)
     Opts.ResourceDir = ResourceDir;
   Opts.BuildDynamicSymbolIndex = EnableIndex;
   Opts.HeavyweightDynamicSymbolIndex = UseDex;