File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -238,8 +238,7 @@ def parse_build_args(args):
238
238
args .bootstrap_dir = os .path .join (args .target_dir , "bootstrap" )
239
239
args .conf = 'release' if args .release else 'debug'
240
240
args .bin_dir = os .path .join (args .target_dir , args .conf )
241
- args .bootstrap = not args .skip_cmake_bootstrap or \
242
- not os .path .exists (os .path .join (os .path .split (args .swiftc_path )[0 ], "swift-build" ))
241
+ args .bootstrap = not args .skip_cmake_bootstrap
243
242
244
243
def parse_test_args (args ):
245
244
"""Parses and cleans arguments necessary for the test action."""
@@ -635,7 +634,11 @@ def build_swiftpm_with_swiftpm(args, integrated_swift_driver):
635
634
swiftpm_args .append (os .path .join (args .bootstrap_dir , "bin/swift-bootstrap" ))
636
635
else :
637
636
note ("Building SwiftPM (with a prebuilt swift-build)" )
638
- swiftpm_args .append (os .path .join (os .path .split (args .swiftc_path )[0 ], "swift-build" ))
637
+ toolchain_swift_build_path = os .path .join (os .path .split (args .swiftc_path )[0 ], "swift-build" )
638
+ if os .path .exists (toolchain_swift_build_path ):
639
+ swiftpm_args .append (toolchain_swift_build_path )
640
+ else :
641
+ swiftpm_args += ["swift" , "build" ]
639
642
swiftpm_args .append ("--disable-sandbox" )
640
643
641
644
# Enforce resolved versions to avoid stray dependencies that aren't local.
You can’t perform that action at this time.
0 commit comments