Skip to content

Commit 2de48a9

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 39d4935 commit 2de48a9

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
@@ -100,6 +100,11 @@
100100
<Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)" />
101101
</Directory>
102102
</Directory>
103+
<Directory Name="swift_static">
104+
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
105+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
106+
</Directory>
107+
</Directory>
103108
</Directory>
104109
<Directory Id="WindowsSDK_usr_share" Name="share" />
105110
</Directory>
@@ -313,6 +318,21 @@
313318
</Component>
314319
</ComponentGroup>
315320

321+
<ComponentGroup Id="CxxStdlib" Directory="CxxStdlib.swiftmodule">
322+
<Component>
323+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftdoc" />
324+
</Component>
325+
<Component>
326+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftinterface" />
327+
</Component>
328+
<Component>
329+
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftmodule" />
330+
</Component>
331+
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
332+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftCxxStdlib.lib" />
333+
</Component>
334+
</ComponentGroup>
335+
316336
<ComponentGroup Id="Distributed" Directory="Distributed.swiftmodule">
317337
<Component>
318338
<File Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftdoc" />
@@ -479,6 +499,7 @@
479499
<ComponentGroupRef Id="_StringProcessing" />
480500
<ComponentGroupRef Id="CRT" />
481501
<ComponentGroupRef Id="Cxx" />
502+
<ComponentGroupRef Id="CxxStdlib" />
482503
<ComponentGroupRef Id="Distributed" />
483504
<ComponentGroupRef Id="Foundation" />
484505
<ComponentGroupRef Id="FoundationXML" />

0 commit comments

Comments
 (0)