From 8bba06dbf0f7fb74ac9d69eb37621e14042b1be3 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Sat, 3 Oct 2026 10:06:59 +1000
Subject: [PATCH] [client] windows: rebuild clean MsQuic archives

---
 cmake/MsQuic.cmake | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cmake/MsQuic.cmake b/cmake/MsQuic.cmake
index 4ef84777..3f8603d1 100644
--- a/cmake/MsQuic.cmake
+++ b/cmake/MsQuic.cmake
@@ -274,7 +274,16 @@ function(lg_add_static_msquic)
     set(LG_MSQUIC_DEBUG_LIBRARY
       "${LG_MSQUIC_BINARY_DIR}/bin/Debug/msquic.lib")
     set(LG_MSQUIC_BUILD_CONFIG "$<CONFIG>")
+    set(LG_MSQUIC_BUILD_LIBRARIES
+      "${LG_MSQUIC_BINARY_DIR}/bin/$<IF:$<CONFIG:Debug>,Debug,Release>/msquic.lib"
+      "${LG_MSQUIC_BINARY_DIR}/obj/$<IF:$<CONFIG:Debug>,Debug,Release>/msquic.lib")
+
+    # The Windows archive step overwrites its intermediate library with the
+    # monolithic result. Recreate both archives before combining dependencies
+    # so a later nested build does not add OpenSSL to the prior result again.
     set(LG_MSQUIC_BUILD_COMMAND
+      "${CMAKE_COMMAND}" -E rm -f ${LG_MSQUIC_BUILD_LIBRARIES}
+      COMMAND
       "${CMAKE_COMMAND}" --build <BINARY_DIR>
       --config ${LG_MSQUIC_BUILD_CONFIG}
       --target msquic_lib