Skip to content

Commit dc167f4

Browse files
committed
Remove flag to disable Swift 6 mode
When swiftlang/swift-package-manager#7545 is in, the `SWIFTSYNTAX_DISABLE_SWIFT_6_MODE` environment variable isn’t used anymore.
1 parent c3fab73 commit dc167f4

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
@@ -295,12 +295,7 @@ let package = Package(
295295
exclude: ["Inputs"]
296296
),
297297
],
298-
// Disable Swift 6 mode when the `SWIFTSYNTAX_DISABLE_SWIFT_6_MODE` environment variable is set. This works around the following
299-
// issue: The self-hosted SwiftPM job has Xcode 15.3 (Swift 5.10) installed and builds a Swift 6 SwiftPM from source.
300-
// It then tries to build itself as a fat binary using the just-built Swift 6 SwiftPM, which uses xcbuild from Xcode
301-
// as the build system. But the xcbuild in the installed Xcode is too old and doesn't know about Swift 6 mode, so it
302-
// fails with: SWIFT_VERSION '6' is unsupported, supported versions are: 4.0, 4.2, 5.0 (rdar://126952308)
303-
swiftLanguageVersions: hasEnvironmentVariable("SWIFTSYNTAX_DISABLE_SWIFT_6_MODE") ? [.v5] : [.v5, .version("6")]
298+
swiftLanguageVersions: [.v5, .version("6")]
304299
)
305300

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

0 commit comments

Comments
 (0)