Skip to content

Commit b6b3632

Browse files
committed
Make skip-cmake-bootstrap unconditional
Follow up to #7089 I don't necessarily expect this to work as-is.
1 parent 9c290df commit b6b3632

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Utilities/bootstrap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ def parse_build_args(args):
238238
args.bootstrap_dir = os.path.join(args.target_dir, "bootstrap")
239239
args.conf = 'release' if args.release else 'debug'
240240
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
243242

244243
def parse_test_args(args):
245244
"""Parses and cleans arguments necessary for the test action."""
@@ -635,7 +634,11 @@ def build_swiftpm_with_swiftpm(args, integrated_swift_driver):
635634
swiftpm_args.append(os.path.join(args.bootstrap_dir, "bin/swift-bootstrap"))
636635
else:
637636
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"]
639642
swiftpm_args.append("--disable-sandbox")
640643

641644
# Enforce resolved versions to avoid stray dependencies that aren't local.

0 commit comments

Comments
 (0)