From 66c67f6cb35b6f8b6cb70c8f6353dc89129bd2ea Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sat, 30 Nov 2024 23:31:52 -0500 Subject: [PATCH] Fix crash on Linux with current toolchain --- build.rs | 2 +- highlight-swift/Package.resolved | 4 ++-- highlight-swift/Package.swift | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.rs b/build.rs index cca1c3c..a1ab24c 100644 --- a/build.rs +++ b/build.rs @@ -22,6 +22,7 @@ fn main() { // link against the swift stdlib and all th supporting pieces println!("cargo:rustc-link-lib=dylib=BlocksRuntime"); println!("cargo:rustc-link-lib=dylib=dispatch"); + println!("cargo:rustc-link-lib=dylib=FoundationEssentials"); println!("cargo:rustc-link-lib=dylib=FoundationNetworking"); println!("cargo:rustc-link-lib=dylib=Foundation"); println!("cargo:rustc-link-lib=dylib=FoundationXML"); @@ -30,7 +31,6 @@ fn main() { println!("cargo:rustc-link-lib=dylib=icuucswift"); println!("cargo:rustc-link-lib=dylib=_InternalSwiftScan"); println!("cargo:rustc-link-lib=dylib=_InternalSwiftStaticMirror"); - println!("cargo:rustc-link-lib=dylib=_InternalSwiftSyntaxParser"); println!("cargo:rustc-link-lib=dylib=swift_Concurrency"); println!("cargo:rustc-link-lib=dylib=swiftCore"); println!("cargo:rustc-link-lib=dylib=swift_Differentiation"); diff --git a/highlight-swift/Package.resolved b/highlight-swift/Package.resolved index 2595be3..dc18ca0 100644 --- a/highlight-swift/Package.resolved +++ b/highlight-swift/Package.resolved @@ -3,10 +3,10 @@ { "identity" : "splash", "kind" : "remoteSourceControl", - "location" : "https://github.com/JohnSundell/Splash.git", + "location" : "https://git.shadowfacts.net/shadowfacts/splash.git", "state" : { "branch" : "master", - "revision" : "2e3f17c2d09689c8bf175c4a84ff7f2ad3353301" + "revision" : "c43e8a9a73e1e65db686f3928d247648d5fd6898" } } ], diff --git a/highlight-swift/Package.swift b/highlight-swift/Package.swift index 96f17fe..1951f9c 100644 --- a/highlight-swift/Package.swift +++ b/highlight-swift/Package.swift @@ -18,14 +18,14 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/JohnSundell/Splash.git", branch: "master"), + .package(url: "https://git.shadowfacts.net/shadowfacts/splash.git", branch: "master"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "highlight-swift", - dependencies: ["Splash"]), + dependencies: [.product(name: "Splash", package: "splash")]), .testTarget(name: "highlight-swift-tests", dependencies: ["highlight-swift"]) ] )