From 895b5c8070bddc022079270eeb4465ccbc8329c7 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Thu, 5 Sep 2024 11:34:41 -0700
Subject: [PATCH] [windows] add usr/lib/swift/clang to the toolchain installer

this directory contains clang's resource headers that are needed by the clang embedded inside of the swift compiler, as it assumes its clang resources are in usr/lib/swift/clang, as opposed to standalone clang looking in usr/lib/clang/<clang_version>
---
 platforms/Windows/bld/bld.wixproj   | 12 ++++++++++++
 platforms/Windows/bld/bld.wxs       |  1 +
 platforms/Windows/shared/shared.wxs |  4 +++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj
index 1155f70d..1c2088ee 100644
--- a/platforms/Windows/bld/bld.wixproj
+++ b/platforms/Windows/bld/bld.wixproj
@@ -5,6 +5,7 @@
       DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
+      TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
     </DefineConstants>
   </PropertyGroup>
 
@@ -22,4 +23,15 @@
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
   </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
+      <ComponentGroupName>SwiftClangResources</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
+      <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index 9fc0a83a..69cdf836 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -506,6 +506,7 @@
       <ComponentGroupRef Id="TestingMacros" />
 
       <ComponentGroupRef Id="ClangResources" />
+      <ComponentGroupRef Id="SwiftClangResources" />
 
       <ComponentGroupRef Id="EnvironmentVariables" />
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index 1585fa42..b983040e 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -44,7 +44,9 @@
               <Directory Id="_usr_include" Name="include" />
               <Directory Id="_usr_lib" Name="lib">
                 <Directory Id="_usr_lib_clang" Name="clang" />
-                <Directory Id="_usr_lib_swift" Name="swift" />
+                <Directory Id="_usr_lib_swift" Name="swift">
+                  <Directory Id="_usr_lib_swift_clang" Name="clang" />
+                </Directory>
               </Directory>
               <Directory Id="_usr_share" Name="share">
                 <Directory Id="_usr_share_docc" Name="docc">