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

Jump to bottom

Remove the workaround for the linker issue in Swift 6.0 #488

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Remove the workaround for the linker issue in Swift 6.0 #488

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/swift.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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