Skip to content

Commit f00cffe

Browse files
committed
build-script: Make --xcode imply --skip-build --skip-early-swift-driver
1 parent 519df89 commit f00cffe

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ def _apply_default_arguments(args):
122122
# Set the default CMake generator.
123123
if args.cmake_generator is None:
124124
args.cmake_generator = 'Ninja'
125+
elif args.cmake_generator == 'Xcode':
126+
# Building with Xcode is deprecated.
127+
args.skip_build = True
128+
args.build_early_swift_driver = False
125129

126130
# --ios-all etc are not supported by open-source Swift.
127131
if args.ios_all:

utils/build_swift/tests/build_swift/test_driver_arguments.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,3 +640,9 @@ def test_implied_defaults_host_test(self):
640640
def test_implied_defaults_swift_disable_dead_stripping(self):
641641
namespace = self.parse_default_args(['--swift-disable-dead-stripping'])
642642
self.assertTrue(namespace.swift_disable_dead_stripping)
643+
644+
def test_implied_defaults_xcode(self):
645+
namespace = self.parse_default_args(['--xcode'])
646+
self.assertEqual(namespace.cmake_generator, 'Xcode')
647+
self.assertTrue(namespace.skip_build)
648+
self.assertFalse(namespace.build_early_swift_driver)

0 commit comments

Comments
 (0)