Skip to content

Commit 0d3d9ac

Browse files
authored
Merge pull request swiftlang#83 from benlangmuir/static
[swiftpm] Statically link to libSwiftPM
2 parents 160bcaa + 986d058 commit 0d3d9ac

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let package = Package(
3737

3838
.target(
3939
name: "SKSwiftPMWorkspace",
40-
dependencies: ["SwiftPM", "SKCore"]),
40+
dependencies: ["SwiftPM-auto", "SKCore"]),
4141
.testTarget(
4242
name: "SKSwiftPMWorkspaceTests",
4343
dependencies: ["SKSwiftPMWorkspace", "SKTestSupport"]),
@@ -76,10 +76,7 @@ let package = Package(
7676
// useful to any Swift package. Similar in spirit to SwiftPM's Basic module.
7777
.target(
7878
name: "SKSupport",
79-
// FIXME: this should be "Utility", not the full SwiftPM library. Right now that creates
80-
// multiple definition warnings at run time because SwiftPM is dynamically linked and
81-
// Utility is static.
82-
dependencies: ["SwiftPM"]),
79+
dependencies: ["SPMUtility"]),
8380
.testTarget(
8481
name: "SKSupportTests",
8582
dependencies: ["SKSupport", "SKTestSupport"]),

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public final class SwiftPMWorkspace {
140140
toolchain: swiftPMToolchain,
141141
flags: buildSetup.flags)
142142

143-
self.packageGraph = PackageGraph(rootPackages: [])
143+
self.packageGraph = PackageGraph(rootPackages: [], requiredDependencies: [])
144144

145145
try reloadPackage()
146146
}

0 commit comments

Comments
 (0)