Skip to content

Commit 770e0e3

Browse files
authored
Merge pull request #2650 from ahoppen/remove-disable-swift-6-mode-flag
Remove flag to disable Swift 6 mode
2 parents 1341739 + dc167f4 commit 770e0e3

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

Package.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,7 @@ let package = Package(
303303
exclude: ["Inputs"]
304304
),
305305
],
306-
// Disable Swift 6 mode when the `SWIFTSYNTAX_DISABLE_SWIFT_6_MODE` environment variable is set. This works around the following
307-
// issue: The self-hosted SwiftPM job has Xcode 15.3 (Swift 5.10) installed and builds a Swift 6 SwiftPM from source.
308-
// It then tries to build itself as a fat binary using the just-built Swift 6 SwiftPM, which uses xcbuild from Xcode
309-
// as the build system. But the xcbuild in the installed Xcode is too old and doesn't know about Swift 6 mode, so it
310-
// fails with: SWIFT_VERSION '6' is unsupported, supported versions are: 4.0, 4.2, 5.0 (rdar://126952308)
311-
swiftLanguageVersions: hasEnvironmentVariable("SWIFTSYNTAX_DISABLE_SWIFT_6_MODE") ? [.v5] : [.v5, .version("6")]
306+
swiftLanguageVersions: [.v5, .version("6")]
312307
)
313308

314309
// This is a fake target that depends on all targets in the package.

0 commit comments

Comments
 (0)