Skip to content

Commit 1b71154

Browse files
authored
Merge pull request #61207 from apple/revert-60815-default-build-early-swiftsyntax
Revert "Default to building the early SwiftSyntax package."
2 parents 6dda91c + 2b5f901 commit 1b71154

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -662,9 +662,8 @@ def create_argument_parser():
662662
option(['--swiftsyntax'], toggle_true('build_swiftsyntax'),
663663
help='build swiftSyntax')
664664

665-
option(['--skip-early-swiftsyntax'],
666-
toggle_false('build_early_swiftsyntax'),
667-
help='skip building early SwiftSyntax')
665+
option(['--early-swiftsyntax'], toggle_true('build_early_swiftsyntax'),
666+
help='build early SwiftSyntax')
668667

669668
option(['--skstresstester'], toggle_true('build_skstresstester'),
670669
help='build the SourceKit stress tester')

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
'build_swiftpm': False,
9191
'build_swift_driver': False,
9292
'build_early_swift_driver': True,
93-
'build_early_swiftsyntax': True,
93+
'build_early_swiftsyntax': False,
9494
'build_swiftsyntax': False,
9595
'build_libparser_only': False,
9696
'build_skstresstester': False,
@@ -519,6 +519,7 @@ class BuildScriptImplOption(_BaseOption):
519519
SetTrueOption('--skip-build'),
520520
SetTrueOption('--swiftpm', dest='build_swiftpm'),
521521
SetTrueOption('--swift-driver', dest='build_swift_driver'),
522+
SetTrueOption('--early-swiftsyntax', dest='build_early_swiftsyntax'),
522523
SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
523524
SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
524525
SetTrueOption('--skstresstester', dest='build_skstresstester'),
@@ -636,7 +637,6 @@ class BuildScriptImplOption(_BaseOption):
636637
DisableOption('--skip-clean-xctest', dest='clean_xctest'),
637638
DisableOption('--skip-clean-llbuild', dest='clean_llbuild'),
638639
DisableOption('--skip-early-swift-driver', dest='build_early_swift_driver'),
639-
DisableOption('--skip-early-swiftsyntax', dest='build_early_swiftsyntax'),
640640
DisableOption('--skip-clean-swiftpm', dest='clean_swiftpm'),
641641
DisableOption('--skip-clean-swift-driver', dest='clean_swift_driver'),
642642
DisableOption('--skip-test-android', dest='test_android'),

0 commit comments

Comments
 (0)