Skip to content

Commit 3b61085

Browse files
committed
WiX: remove llbuild.dll from toolchain distribution
This has been made static with swiftlang/swift-llbuild#852. Adjust the packaging rules accordingly.
1 parent 983936e commit 3b61085

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

platforms/Windows/toolchain-amd64.wxs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,6 @@
654654
<File Id="swift_build_tool.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.exe" Checksum="yes" />
655655
</Component>
656656

657-
<Component Id="llbuild.dll" Directory="_usr_bin" Guid="f140cd98-63b5-4b62-8990-36e2b66569d4">
658-
<File Id="llbuild.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.dll" Checksum="yes" />
659-
</Component>
660657
<Component Id="llbuildSwift.dll" Directory="_usr_bin" Guid="4386ca67-150b-424f-a699-7029f41746d5">
661658
<File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
662659
</Component>
@@ -668,9 +665,6 @@
668665
<File Id="swift_build_tool.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.pdb" Checksum="yes" DiskId="10" />
669666
</Component>
670667

671-
<Component Id="llbuild.pdb" Directory="_usr_bin" Guid="a94f8dc8-8148-4cf1-9d3d-6d55e1d332bb">
672-
<File Id="llbuild.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.pdb" Checksum="yes" DiskId="10" />
673-
</Component>
674668
<Component Id="llbuildSwift.pdb" Directory="_usr_bin" Guid="7a0a4f52-344f-41cc-bd9a-266af3afbc84">
675669
<File Id="llbuildSwift.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.pdb" Checksum="yes" DiskId="10" />
676670
</Component>

platforms/Windows/toolchain-arm64.wxs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,6 @@
654654
<File Id="swift_build_tool.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.exe" Checksum="yes" />
655655
</Component>
656656

657-
<Component Id="llbuild.dll" Directory="_usr_bin" Guid="5a20b6e2-6d0c-49c3-88fa-6179591a7df2">
658-
<File Id="llbuild.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.dll" Checksum="yes" />
659-
</Component>
660657
<Component Id="llbuildSwift.dll" Directory="_usr_bin" Guid="93fd1e4e-7b70-4440-93fb-0889e50840f3">
661658
<File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
662659
</Component>
@@ -668,9 +665,6 @@
668665
<File Id="swift_build_tool.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.pdb" Checksum="yes" DiskId="10" />
669666
</Component>
670667

671-
<Component Id="llbuild.pdb" Directory="_usr_bin" Guid="1ea909f5-2170-42af-b544-883566e905ac">
672-
<File Id="llbuild.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuild.pdb" Checksum="yes" DiskId="10" />
673-
</Component>
674668
<Component Id="llbuildSwift.pdb" Directory="_usr_bin" Guid="07c8df77-4dd8-4081-90ba-28ebd2b4e560">
675669
<File Id="llbuildSwift.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.pdb" Checksum="yes" DiskId="10" />
676670
</Component>

0 commit comments

Comments
 (0)