Skip to content

Commit 67b1e3a

Browse files
committed
[cxx-interop] CxxShim files became arch-independent
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765 rdar://110788977
1 parent 7962cf3 commit 67b1e3a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

platforms/Windows/sdk.wxs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,12 @@
416416
</ComponentGroup>
417417

418418
<ComponentGroup Id="libcxxshim">
419-
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.h">
420-
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.h" Checksum="yes" KeyPath="yes" />
419+
<Component Directory="WindowsSDK_usr_lib_swift_windows" Id="libcxxshim.h">
420+
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" Checksum="yes" KeyPath="yes" />
421421
</Component>
422422

423-
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.modulemap">
424-
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.modulemap" Checksum="yes" KeyPath="yes" />
423+
<Component Directory="WindowsSDK_usr_lib_swift_windows" Id="libcxxshim.modulemap">
424+
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" KeyPath="yes" />
425425
</Component>
426426
</ComponentGroup>
427427

0 commit comments

Comments
 (0)