From 67b1e3a0c86fc2f20f943cea610409874798adb5 Mon Sep 17 00:00:00 2001
From: Egor Zhdan <e_zhdan@apple.com>
Date: Thu, 22 Jun 2023 15:42:01 +0100
Subject: [PATCH] [cxx-interop] CxxShim files became arch-independent

This adjusts the Windows installation logic after the changes in https://github.com/apple/swift/pull/66765

rdar://110788977
---
 platforms/Windows/sdk.wxs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 98e8efc5..06de05ca 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -416,12 +416,12 @@
     </ComponentGroup>
 
     <ComponentGroup Id="libcxxshim">
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.h">
-        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.h" Checksum="yes" KeyPath="yes" />
+      <Component Directory="WindowsSDK_usr_lib_swift_windows" Id="libcxxshim.h">
+        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" Checksum="yes" KeyPath="yes" />
       </Component>
 
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.modulemap">
-        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.modulemap" Checksum="yes" KeyPath="yes" />
+      <Component Directory="WindowsSDK_usr_lib_swift_windows" Id="libcxxshim.modulemap">
+        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" KeyPath="yes" />
       </Component>
     </ComponentGroup>