Skip to content

build: update CMake requirements and simplify #867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2025

Conversation

compnerd
Copy link
Member

Update the minimum required CMake version to match the rest of the Swift toolchain build. This allows us to simplify some of the logic and remove some workarounds that are no longer needed.

CMake 3.19.0 fixed the compiler invocation requiring the local
workaround. Match the runtimes CMake version requirement and drop the
workaround.
CMake 3.25 introduced a more consistent way to check what system is
being built for. Adopt that uniformly through the build to make it
easier to understand.
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

Copy link
Contributor

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the one aNDROID -> ANDROID change, this looks good to me.

Co-authored-by: Evan Wilde <etceterawilde@gmail.com>
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

1 similar comment
@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@compnerd compnerd merged commit 8c02f89 into swiftlang:main Apr 17, 2025
2 checks passed
@compnerd compnerd deleted the update-requirements branch April 17, 2025 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants