Skip to content

[build-script] Disable building and installing the Foundation macros for standalone SDKs (#78782) #79040

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 1 commit into from
Feb 6, 2025

Conversation

finagolfin
Copy link
Member

Explanation: The --build-swift-tools=0 flag is currently used by a few build presets to disable building and installing the compiler and other host tools, like the Observation macros in this repo. Extend it to also disable building and installing the new Foundation macros, plus remove a CMake flag for Android that is now directly set in that repo.

Scope: Only used to build standalone SDKs

Issue: None

Original PR: #78782

Risk: None

Testing: Passed all CI on trunk, plus on my Android CI for several months now

Reviewer: @jmschonfeld

…for standalone SDKs (swiftlang#78782)

Also, remove CMake flag for Android that is now directly set in that repo.
@finagolfin finagolfin added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.1 labels Jan 30, 2025
@finagolfin finagolfin requested a review from a team as a code owner January 30, 2025 08:51
@finagolfin
Copy link
Member Author

@swift-ci please test

@finagolfin
Copy link
Member Author

Ping @bnbarham, would you review?

Copy link
Member

@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.

Seems fine to me The pthreads change seems unrelated though?

@DougGregor
Copy link
Member

@finagolfin is the pthreads change supposed to be here?

@finagolfin
Copy link
Member Author

Yes, the pthreads change is completely unrelated, just happens to be in the same file. That's why I specifically called it out in the commit and the 6.1 backport template above, plus linked to the 6.1 pull that made it redundant. Any problem with including that cleanup too? It already works fine in trunk with this cherry-picked commit.

@DougGregor
Copy link
Member

No, not a problem. Let's merge!

@DougGregor DougGregor merged commit 80419b9 into swiftlang:release/6.1 Feb 6, 2025
5 checks passed
@finagolfin finagolfin deleted the macro branch February 6, 2025 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 6.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants