Skip to content

Commit

Permalink
Remove the workaround for the linker issue in Swift 6.0
Browse files Browse the repository at this point in the history
It's fixed in the main branch and cherry-picked to the 6.0 branch.

See swiftlang/swift#74277
  • Loading branch information
kateinoigakukun committed Jun 20, 2024
1 parent 6a41c96 commit 8272dfb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
swift: "6.0"
swift-install:
dir: "swift-6.0-branch/xcode"
version: "swift-6.0-DEVELOPMENT-SNAPSHOT-2024-06-07-a"
version: "swift-6.0-DEVELOPMENT-SNAPSHOT-2024-06-19-a"
- os: macos-14
xcode: "15.4"
swift: "5.10"
Expand Down
6 changes: 0 additions & 6 deletions Sources/CartonCore/Environment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@ public enum Environment: String, CaseIterable {
// for future dynamic linking support.
parameters.otherSwiftcFlags += ["-static-stdlib"]

#if compiler(>=6.0) && compiler(<6.1)
// A workaround for the linker issue.
// https://github.com/swiftwasm/swift/issues/5580
parameters.otherLinkerFlags += ["-lswift_RegexParser"]
#endif

switch self {
case .command: break
case .node, .browser:
Expand Down
2 changes: 1 addition & 1 deletion Sources/CartonHelpers/DefaultToolchain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#if compiler(>=6.0)
public let defaultToolchainVersion = "wasm-6.0-SNAPSHOT-2024-06-08-a"
public let defaultToolchainVersion = "wasm-6.0-SNAPSHOT-2024-06-19-a"
#elseif compiler(>=5.10)
public let defaultToolchainVersion = "wasm-5.10.0-RELEASE"
#else
Expand Down

0 comments on commit 8272dfb

Please sign in to comment.