Skip to content

[CMake] Fix some issues in new runtime build for Linux and Windows builds #78134

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 2 commits into from
Dec 13, 2024

Conversation

etcwilde
Copy link
Member

Fixing some issues in the runtime build. The defaulted settings were not set right.
Also, not all of the ObjC files are actually ObjC or part of the ObjC interop. We need to build ErrorObject.mm and SwiftObject.mm as part of all builds or things don't link.

`defaulted_set` wasn't expanding the default variable, just setting the
value of the variable the name of the variable that should have been
doing the defaulting.
These files are required in order to link libswiftCore regardless of
whether ObjectiveC is required.
@etcwilde
Copy link
Member Author

@swift-ci please smoke test

@etcwilde
Copy link
Member Author

@swift-ci please test Linux

@etcwilde
Copy link
Member Author

@swift-ci please test Windows

@compnerd compnerd merged commit 59a9ef5 into swiftlang:main Dec 13, 2024
4 checks passed
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