averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[build-script] Build CMake before Ninja

Browse Source 
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.
This commit is contained in:
Evan Wilde
2025-03-25 10:23:47 -07:00
parent f9cb78bb26
commit 813ed210b3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/build-script
View File

@@ -698,14 +698,14 @@ def main_normal():
# Preprocess the arguments to apply defaults.
apply_default_arguments(toolchain, args)
# Create the build script invocation.
invocation = build_script_invocation.BuildScriptInvocation(toolchain, args)
cmake = CMake(args=args, toolchain=toolchain)
toolchain.cmake = cmake.get_cmake_path(source_root=SWIFT_SOURCE_ROOT,
build_root=SWIFT_BUILD_ROOT)
args.cmake = toolchain.cmake
# Create the build script invocation.
invocation = build_script_invocation.BuildScriptInvocation(toolchain, args)
# Validate the arguments.
validate_arguments(toolchain, args)