Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Packaging: Support using Tools Support Core dylib #1805

Merged
merged 1 commit into from
Feb 26, 2025
Merged

Packaging: Support using Tools Support Core dylib #1805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTPM_MACOS_DEP
macOSPlatform = .macOS(.v12)
}

let swiftToolsSupportCoreLibName = (ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil) ? "SwiftToolsSupport-auto": "SwiftToolsSupport"

let package = Package(
name: "swift-driver",
platforms: [
Expand Down Expand Up @@ -51,7 +53,7 @@ let package = Package(
name: "SwiftDriver",
dependencies: [
"SwiftOptions",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: swiftToolsSupportCoreLibName, package: "swift-tools-support-core"),
"CSwiftScan",
],
exclude: ["CMakeLists.txt"]),
Expand All @@ -61,7 +63,7 @@ let package = Package(
name: "SwiftDriverExecution",
dependencies: [
"SwiftDriver",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core")
.product(name: swiftToolsSupportCoreLibName, package: "swift-tools-support-core")
],
exclude: ["CMakeLists.txt"]),

Expand All @@ -76,7 +78,7 @@ let package = Package(
dependencies: [
"IncrementalTestFramework",
"TestUtilities",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: swiftToolsSupportCoreLibName, package: "swift-tools-support-core"),
]),

.target(
Expand All @@ -101,7 +103,7 @@ let package = Package(
.target(
name: "SwiftOptions",
dependencies: [
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: swiftToolsSupportCoreLibName, package: "swift-tools-support-core"),
],
exclude: ["CMakeLists.txt"]),
.testTarget(
Expand All @@ -120,7 +122,7 @@ let package = Package(
dependencies: [
"SwiftOptions",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: swiftToolsSupportCoreLibName, package: "swift-tools-support-core"),
],
exclude: ["CMakeLists.txt"]),

Expand Down