Skip to content

Commit 8272dfb

Browse files
Remove the workaround for the linker issue in Swift 6.0
It's fixed in the main branch and cherry-picked to the 6.0 branch. See swiftlang/swift#74277
1 parent 6a41c96 commit 8272dfb

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

.github/workflows/swift.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
swift: "6.0"
2020
swift-install:
2121
dir: "swift-6.0-branch/xcode"
22-
version: "swift-6.0-DEVELOPMENT-SNAPSHOT-2024-06-07-a"
22+
version: "swift-6.0-DEVELOPMENT-SNAPSHOT-2024-06-19-a"
2323
- os: macos-14
2424
xcode: "15.4"
2525
swift: "5.10"

Sources/CartonCore/Environment.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ public enum Environment: String, CaseIterable {
6363
// for future dynamic linking support.
6464
parameters.otherSwiftcFlags += ["-static-stdlib"]
6565

66-
#if compiler(>=6.0) && compiler(<6.1)
67-
// A workaround for the linker issue.
68-
// https://github.com/swiftwasm/swift/issues/5580
69-
parameters.otherLinkerFlags += ["-lswift_RegexParser"]
70-
#endif
71-
7266
switch self {
7367
case .command: break
7468
case .node, .browser:

Sources/CartonHelpers/DefaultToolchain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#if compiler(>=6.0)
16-
public let defaultToolchainVersion = "wasm-6.0-SNAPSHOT-2024-06-08-a"
16+
public let defaultToolchainVersion = "wasm-6.0-SNAPSHOT-2024-06-19-a"
1717
#elseif compiler(>=5.10)
1818
public let defaultToolchainVersion = "wasm-5.10.0-RELEASE"
1919
#else

0 commit comments

Comments
 (0)