Skip to content

Commit 9cb52fd

Browse files
authored
WiX: package libcxxstdlibshim.h on Windows
This file was not being packaged into the installer, which gives us an incomplete module. Fixes: swiftlang/swift#67462
1 parent 1407953 commit 9cb52fd

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

platforms/Windows/sdk-amd64.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,10 @@
452452
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e4fa6e5c-3dd5-49fd-9f27-a72d58c8d156">
453453
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
454454
</Component>
455+
456+
<Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d80bdcb8-fae1-43a9-8e97-0d0649280009">
457+
<File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
458+
</Component>
455459
</ComponentGroup>
456460

457461
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_x86_64">

platforms/Windows/sdk-arm64.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,10 @@
452452
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="b5f65b19-cf8f-4862-b378-3e299887afa3">
453453
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
454454
</Component>
455+
456+
<Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="8277b66f-31c2-4f51-af1c-f49fb4404a13">
457+
<File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
458+
</Component>
455459
</ComponentGroup>
456460

457461
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_aarch64">

platforms/Windows/sdk-x86.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,10 @@
450450
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows" Guid="52c178a4-f65b-46a4-9089-c686c755bf2e">
451451
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" Checksum="yes" />
452452
</Component>
453+
454+
<Component Id="libcxxstdlibshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="e46f7763-93cf-451d-bdd3-060b1c1a01a0">
455+
<File Id="libcxxstdlibshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" Checksum="yes" />
456+
</Component>
453457
</ComponentGroup>
454458

455459
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_i686">

0 commit comments

Comments
 (0)