Skip to content

Commit cb497bd

Browse files
authored
Don’t disable Swift 6 mode in swift-syntax (#7558)
* **Explanation**: Remove code that forced swift-syntax to be built in Swift 5 mode because the underlying issue was fixed by #7504 * **Scope**: Building SwiftPM * **Risk**: Low, if there are any issues, they will be caught at build time * **Testing**: Checked that SwiftPM still builds * **Issue**: n/a * **Reviewer**: @bnbarham on #7545
1 parent 6c4be0d commit cb497bd

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

Utilities/bootstrap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,6 @@ def get_swiftpm_env_cmd(args):
744744
env_cmd.append("SWIFTPM_LLBUILD_FWK=1")
745745
env_cmd.append("SWIFTCI_USE_LOCAL_DEPS=1")
746746
env_cmd.append("SWIFTPM_MACOS_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
747-
# Disable Swift 6 mode in swift-syntax to work around rdar://126952308
748-
env_cmd.append("SWIFTSYNTAX_DISABLE_SWIFT_6_MODE=1")
749747

750748
if not '-macosx' in args.build_target and args.command == 'install':
751749
env_cmd.append("SWIFTCI_INSTALL_RPATH_OS=%s" % args.platform_path.group(2))

Utilities/build-using-self

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ echo "Current directory is ${PWD}"
2020

2121
CONFIGURATION=debug
2222
export SWIFTCI_IS_SELF_HOSTED=1
23-
# Disable Swift 6 mode in swift-syntax to work around rdar://126952308
24-
export SWIFTSYNTAX_DISABLE_SWIFT_6_MODE=1
2523

2624
set -x
2725

0 commit comments

Comments
 (0)