From c3c761c02403d6b7e1a41ee7dad653aad2331db9 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 3 Aug 2023 10:22:50 -0700
Subject: [PATCH 1/2] WiX: package `libcxxstdlibshim.h` on Windows

This file was not being packaged into the installer, which gives us an
incomplete module.

Fixes: apple/swift#67462
---
 platforms/Windows/sdk-amd64.wxs | 4 ++++
 platforms/Windows/sdk-arm64.wxs | 4 ++++
 platforms/Windows/sdk-x86.wxs   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs
index b0322798..c6556257 100644
--- a/platforms/Windows/sdk-amd64.wxs
+++ b/platforms/Windows/sdk-amd64.wxs
@@ -452,6 +452,10 @@
       <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e4fa6e5c-3dd5-49fd-9f27-a72d58c8d156">
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
+
+      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d80bdcb8-fae1-43a9-8e97-0d0649280009">
+        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_x86_64">
diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs
index 2cfc4815..e53507a2 100644
--- a/platforms/Windows/sdk-arm64.wxs
+++ b/platforms/Windows/sdk-arm64.wxs
@@ -452,6 +452,10 @@
       <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="b5f65b19-cf8f-4862-b378-3e299887afa3">
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
+
+      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="8277b66f-31c2-4f51-af1c-f49fb4404a13">
+        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_aarch64">
diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs
index 35608a80..ca251e5f 100644
--- a/platforms/Windows/sdk-x86.wxs
+++ b/platforms/Windows/sdk-x86.wxs
@@ -450,6 +450,10 @@
       <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="52c178a4-f65b-46a4-9089-c686c755bf2e">
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
+
+      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e46f7763-93cf-451d-bdd3-060b1c1a01a0">
+        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_i686">

From 701ae87d1478c98c27f2e97652275f99770f9558 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 3 Aug 2023 19:51:12 -0700
Subject: [PATCH 2/2] Correct name

---
 platforms/Windows/sdk-amd64.wxs | 4 ++--
 platforms/Windows/sdk-arm64.wxs | 4 ++--
 platforms/Windows/sdk-x86.wxs   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs
index c6556257..9ef8bcad 100644
--- a/platforms/Windows/sdk-amd64.wxs
+++ b/platforms/Windows/sdk-amd64.wxs
@@ -453,8 +453,8 @@
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
 
-      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d80bdcb8-fae1-43a9-8e97-0d0649280009">
-        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      <Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d80bdcb8-fae1-43a9-8e97-0d0649280009">
+        <File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs
index e53507a2..dc81226d 100644
--- a/platforms/Windows/sdk-arm64.wxs
+++ b/platforms/Windows/sdk-arm64.wxs
@@ -453,8 +453,8 @@
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
 
-      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="8277b66f-31c2-4f51-af1c-f49fb4404a13">
-        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      <Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="8277b66f-31c2-4f51-af1c-f49fb4404a13">
+        <File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs
index ca251e5f..54ec857a 100644
--- a/platforms/Windows/sdk-x86.wxs
+++ b/platforms/Windows/sdk-x86.wxs
@@ -451,8 +451,8 @@
         <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
       </Component>
 
-      <Component Id="libcxxstdlibshims.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e46f7763-93cf-451d-bdd3-060b1c1a01a0">
-        <File Id="libcxxstdlibshims.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshims.h" Checksum="yes" />
+      <Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e46f7763-93cf-451d-bdd3-060b1c1a01a0">
+        <File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
       </Component>
     </ComponentGroup>