Skip to content

Commit 813ed21

Browse files
committed
[build-script] Build CMake before Ninja
Ninja requires CMake 3.15 or newer to build, while the CMake on Amazon Linux 2 is only 2.8. We bootstrap a newer CMake anyway, so build it before Ninja so that Ninja has a new enough CMake.
1 parent f9cb78b commit 813ed21

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build-script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,14 +698,14 @@ def main_normal():
698698
# Preprocess the arguments to apply defaults.
699699
apply_default_arguments(toolchain, args)
700700

701-
# Create the build script invocation.
702-
invocation = build_script_invocation.BuildScriptInvocation(toolchain, args)
703-
704701
cmake = CMake(args=args, toolchain=toolchain)
705702
toolchain.cmake = cmake.get_cmake_path(source_root=SWIFT_SOURCE_ROOT,
706703
build_root=SWIFT_BUILD_ROOT)
707704
args.cmake = toolchain.cmake
708705

706+
# Create the build script invocation.
707+
invocation = build_script_invocation.BuildScriptInvocation(toolchain, args)
708+
709709
# Validate the arguments.
710710
validate_arguments(toolchain, args)
711711

0 commit comments

Comments
 (0)