diff --git a/build.zig b/build.zig
index 0ff5285201..d595188c72 100644
--- a/build.zig
+++ b/build.zig
@@ -1061,6 +1061,7 @@ const lld_libs = [_][]const u8{
 // from these libs.
 const llvm_libs = [_][]const u8{
     "LLVMWindowsManifest",
+    "LLVMWindowsDriver",
     "LLVMXRay",
     "LLVMLibDriver",
     "LLVMDlltoolDriver",
@@ -1168,11 +1169,10 @@ const llvm_libs = [_][]const u8{
     "LLVMOrcTargetProcess",
     "LLVMOrcShared",
     "LLVMDWP",
-    "LLVMSymbolize",
-    "LLVMDebugInfoPDB",
     "LLVMDebugInfoGSYM",
     "LLVMOption",
     "LLVMObjectYAML",
+    "LLVMObjCopy",
     "LLVMMCA",
     "LLVMMCDisassembler",
     "LLVMLTO",
@@ -1191,7 +1191,6 @@ const llvm_libs = [_][]const u8{
     "LLVMGlobalISel",
     "LLVMMIRParser",
     "LLVMAsmPrinter",
-    "LLVMDebugInfoMSF",
     "LLVMSelectionDAG",
     "LLVMCodeGen",
     "LLVMIRReader",
@@ -1207,6 +1206,9 @@ const llvm_libs = [_][]const u8{
     "LLVMBitWriter",
     "LLVMAnalysis",
     "LLVMProfileData",
+    "LLVMSymbolize",
+    "LLVMDebugInfoPDB",
+    "LLVMDebugInfoMSF",
     "LLVMDebugInfoDWARF",
     "LLVMObject",
     "LLVMTextAPI",
@@ -1214,6 +1216,7 @@ const llvm_libs = [_][]const u8{
     "LLVMMC",
     "LLVMDebugInfoCodeView",
     "LLVMBitReader",
+    "LLVMFuzzerCLI",
     "LLVMCore",
     "LLVMRemarks",
     "LLVMBitstreamReader",
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
index d5de1eb822..60a52056d8 100644
--- a/cmake/Findllvm.cmake
+++ b/cmake/Findllvm.cmake
@@ -202,6 +202,7 @@ else()
   # reformatting using your favorite text editor. Note we do not execute
   # `llvm-config` here because we are cross compiling.
   FIND_AND_ADD_LLVM_LIB(LLVMWindowsManifest)
+  FIND_AND_ADD_LLVM_LIB(LLVMWindowsDriver)
   FIND_AND_ADD_LLVM_LIB(LLVMXRay)
   FIND_AND_ADD_LLVM_LIB(LLVMLibDriver)
   FIND_AND_ADD_LLVM_LIB(LLVMDlltoolDriver)
@@ -309,11 +310,10 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMOrcTargetProcess)
   FIND_AND_ADD_LLVM_LIB(LLVMOrcShared)
   FIND_AND_ADD_LLVM_LIB(LLVMDWP)
-  FIND_AND_ADD_LLVM_LIB(LLVMSymbolize)
-  FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB)
   FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoGSYM)
   FIND_AND_ADD_LLVM_LIB(LLVMOption)
   FIND_AND_ADD_LLVM_LIB(LLVMObjectYAML)
+  FIND_AND_ADD_LLVM_LIB(LLVMObjCopy)
   FIND_AND_ADD_LLVM_LIB(LLVMMCA)
   FIND_AND_ADD_LLVM_LIB(LLVMMCDisassembler)
   FIND_AND_ADD_LLVM_LIB(LLVMLTO)
@@ -332,7 +332,6 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMGlobalISel)
   FIND_AND_ADD_LLVM_LIB(LLVMMIRParser)
   FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter)
-  FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)
   FIND_AND_ADD_LLVM_LIB(LLVMSelectionDAG)
   FIND_AND_ADD_LLVM_LIB(LLVMCodeGen)
   FIND_AND_ADD_LLVM_LIB(LLVMIRReader)
@@ -348,6 +347,9 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMBitWriter)
   FIND_AND_ADD_LLVM_LIB(LLVMAnalysis)
   FIND_AND_ADD_LLVM_LIB(LLVMProfileData)
+  FIND_AND_ADD_LLVM_LIB(LLVMSymbolize)
+  FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB)
+  FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)
   FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)
   FIND_AND_ADD_LLVM_LIB(LLVMObject)
   FIND_AND_ADD_LLVM_LIB(LLVMTextAPI)
@@ -355,6 +357,7 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMMC)
   FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView)
   FIND_AND_ADD_LLVM_LIB(LLVMBitReader)
+  FIND_AND_ADD_LLVM_LIB(LLVMFuzzerCLI)
   FIND_AND_ADD_LLVM_LIB(LLVMCore)
   FIND_AND_ADD_LLVM_LIB(LLVMRemarks)
   FIND_AND_ADD_LLVM_LIB(LLVMBitstreamReader)