Skip to content

Commit

Permalink
WiX: adjust Cxx module packaging
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
compnerd committed Aug 28, 2023
1 parent 50691ce commit 677ca69
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions platforms/Windows/rtl/lib/rtllib.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
<Component>
<File Source="$(SDK_ROOT)\usr\bin\swiftCore.dll" />
</Component>
<Component>
<File Source="$(SDK_ROOT)\usr\bin\swiftCxx.dll" />
</Component>

<!-- TODO(compnerd) should we distribute the undecoration library in the runtime?
<Component Directory="_usr_bin" Id="swiftDemangle.dll">
Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/sdk/sdk.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(ArchTriple).swiftmodule" />
</Component>
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftCxx.lib" />
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\libswiftCxx.lib" />
</Component>
</ComponentGroup>

Expand Down

0 comments on commit 677ca69

Please sign in to comment.