Skip to content

Commit 5962f87

Browse files
committed
WiX: package CxxStdlib on Windows
This is the first standard library component which is static only. Add this new module to the distribution.
1 parent 371b276 commit 5962f87

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

platforms/Windows/sdk/sdk.wxs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
<Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(ArchArchDir)" />
100100
</Directory>
101101
</Directory>
102+
<Directory Name="swift_static">
103+
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
104+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
105+
</Directory>
106+
</Directory>
102107
</Directory>
103108
<Directory Id="WindowsSDK_usr_share" Name="share" />
104109
</Directory>
@@ -312,6 +317,21 @@
312317
</Component>
313318
</ComponentGroup>
314319

320+
<ComponentGroup Id="CxxStdlib" Directory="CxxStdlib.swiftmodule">
321+
<Component>
322+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftdoc" />
323+
</Component>
324+
<Component>
325+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftinterface" />
326+
</Component>
327+
<Component>
328+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftmodule" />
329+
</Component>
330+
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
331+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\libswiftCxxStdlib.lib" />
332+
</Component>
333+
</ComponentGroup>
334+
315335
<ComponentGroup Id="Distributed" Directory="Distributed.swiftmodule">
316336
<Component>
317337
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -490,6 +510,7 @@
490510
<ComponentGroupRef Id="_StringProcessing" />
491511
<ComponentGroupRef Id="CRT" />
492512
<ComponentGroupRef Id="Cxx" />
513+
<ComponentGroupRef Id="CxxStdlib" />
493514
<ComponentGroupRef Id="Distributed" />
494515
<ComponentGroupRef Id="Foundation" />
495516
<ComponentGroupRef Id="FoundationXML" />

0 commit comments

Comments
 (0)