Skip to content

Commit 3b9d280

Browse files
committed
[Build System: build-script] Update the --stdlib-deployment-targets flag to no longer append from multiple uses, instead use the standard last-wins strategy. This aligns better with the existing documentation for the argument and the similar --build-stdlib-deployment-targets flag.
(cherry picked from commit 563bef6)
1 parent 28cb627 commit 3b9d280

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

utils/build_swift/driver_arguments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ def create_argument_parser():
501501
help='A space separated list of targets to cross-compile host '
502502
'Swift tools for. Can be used multiple times.')
503503

504-
option('--stdlib-deployment-targets', append,
504+
option('--stdlib-deployment-targets', store,
505505
type=argparse.ShellSplitType(),
506506
default=None,
507507
help='list of targets to compile or cross-compile the Swift '

utils/build_swift/tests/expected_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ class IgnoreOption(_BaseOption):
523523
StrOption('--host-target'),
524524
StrOption('--lit-args'),
525525
StrOption('--llvm-targets-to-build'),
526+
StrOption('--stdlib-deployment-targets'),
526527
StrOption('--swift-darwin-module-archs'),
527528
StrOption('--swift-darwin-supported-archs'),
528529

@@ -558,7 +559,6 @@ class IgnoreOption(_BaseOption):
558559
AppendOption('--cross-compile-hosts'),
559560
AppendOption('--extra-cmake-options'),
560561
AppendOption('--extra-swift-args'),
561-
AppendOption('--stdlib-deployment-targets'),
562562
AppendOption('--test-paths'),
563563

564564
UnsupportedOption('--build-jobs'),

0 commit comments

Comments
 (0)