Skip to content

Commit 677ca69

Browse files
committed
WiX: adjust Cxx module packaging
Adjust for Cxx being built statically now (which removes the runtime distribution content and puts the library into the SDK). The C++ interop support now matches the Darwin and Linux platforms and distributes it as static libraries as the interface is fragile still.
1 parent 50691ce commit 677ca69

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

platforms/Windows/rtl/lib/rtllib.wxs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<Component>
3030
<File Source="$(SDK_ROOT)\usr\bin\swiftCore.dll" />
3131
</Component>
32-
<Component>
33-
<File Source="$(SDK_ROOT)\usr\bin\swiftCxx.dll" />
34-
</Component>
3532

3633
<!-- TODO(compnerd) should we distribute the undecoration library in the runtime?
3734
<Component Directory="_usr_bin" Id="swiftDemangle.dll">

platforms/Windows/sdk/sdk.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(ArchTriple).swiftmodule" />
311311
</Component>
312312
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
313-
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftCxx.lib" />
313+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\libswiftCxx.lib" />
314314
</Component>
315315
</ComponentGroup>
316316

0 commit comments

Comments
 (0)