File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -886,8 +886,6 @@ class BuildScriptInvocation(object):
886
886
product_classes = []
887
887
if self .args .build_swiftpm :
888
888
product_classes .append (products .SwiftPM )
889
- if self .args .build_swift_driver or self .args .install_swift_driver :
890
- product_classes .append (products .SwiftDriver )
891
889
if self .args .build_swiftsyntax :
892
890
product_classes .append (products .SwiftSyntax )
893
891
if self .args .build_skstresstester :
@@ -908,6 +906,13 @@ class BuildScriptInvocation(object):
908
906
product_classes .append (products .SwiftInspect )
909
907
if self .args .tsan_libdispatch_test :
910
908
product_classes .append (products .TSanLibDispatch )
909
+
910
+ # Keep SwiftDriver at last.
911
+ # swift-driver's integration with the build scripts is not fully
912
+ # supported. Using swift-driver to build these products may hit
913
+ # failures.
914
+ if self .args .build_swift_driver or self .args .install_swift_driver :
915
+ product_classes .append (products .SwiftDriver )
911
916
# Sanity check that all of our non-impl classes are actually
912
917
# not build_script_impl products.
913
918
for prod in product_classes :
You can’t perform that action at this time.
0 commit comments