Skip to content

fix cross compilation for linux on macOS fails #1317 #1318

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

Merged
merged 2 commits into from
Jun 8, 2025
Merged

fix cross compilation for linux on macOS fails #1317 #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8938697
change CSQLite dep to SwiftToolchainCSQLite to allow swift sdk cross …
ha100 Jun 8, 2025
fc774a2
fix macOS build via platform condition
ha100 Jun 8, 2025
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
69 changes: 40 additions & 29 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
// swift-tools-version:5.9
import PackageDescription

let deps: [Package.Dependency] = [
.github("swiftlang/swift-toolchain-sqlite", exact: "1.0.4")
]

let targets: [Target] = [
.target(
name: "SQLite",
dependencies: [
.product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.linux, .windows]))
],
exclude: [
"Info.plist"
]
)
]

let testTargets: [Target] = [
.testTarget(
name: "SQLiteTests",
dependencies: [
"SQLite"
],
path: "Tests/SQLiteTests",
exclude: [
"Info.plist"
],
resources: [
.copy("Resources")
]
)
]

let package = Package(
name: "SQLite.swift",
platforms: [
Expand All @@ -16,34 +48,13 @@ let package = Package(
targets: ["SQLite"]
)
],
targets: [
.target(
name: "SQLite",
exclude: [
"Info.plist"
]
),
.testTarget(
name: "SQLiteTests",
dependencies: [
"SQLite"
],
path: "Tests/SQLiteTests",
exclude: [
"Info.plist"
],
resources: [
.copy("Resources")
]
)
]
dependencies: deps,
targets: targets + testTargets
)

#if os(Linux)
package.dependencies = [
.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")
]
package.targets.first?.dependencies += [
.product(name: "CSQLite", package: "CSQLite")
]
#endif
extension Package.Dependency {

static func github(_ repo: String, exact ver: Version) -> Package.Dependency {
.package(url: "https://github.com/\(repo)", exact: ver)
}
}
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Backup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Connection+Aggregation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Connection+Attach.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Result.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Core/Statement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Core/Connection+AttachTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Core/Connection+PragmaTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Core/ConnectionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Core/ResultTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Core/StatementTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Typed/CustomAggregationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Typed/QueryIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteTests/Typed/QueryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sqlite3
#elseif SQLITE_SWIFT_SQLCIPHER
import SQLCipher
#elseif os(Linux)
import CSQLite
import SwiftToolchainCSQLite
#else
import SQLite3
#endif
Expand Down