Skip to content

[cherry-pick swift/release/6.0][clang][modules] Built-in modules are not correctly enabled for Mac Catalyst #9152

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

Conversation

ian-twilightcoder
Copy link

Mac Catalyst is the iOS platform, but it builds against the macOS SDK and so it needs to be checking the macOS SDK version instead of the iOS one. Add tests against a greater-than SDK version just to make sure this works beyond the initially supporting SDKs.

rdar://116490661

@ian-twilightcoder
Copy link
Author

Explanation: This change is required for open source clang to be able to work with Mac Catalyst wit the SDKs in Xcode 16 beta 5 and beyond. (It will break compatibility for the earlier betas, but not the earlier releases.)
Radar (and possibly SR Issue): rdar://116490661
Scope: This affects compiling for Mac Catalyst against the Xcode 16 beta SDKs, it does not affect previous (Xcode 15 and earlier) SDKs.
Risk: None anticipated.
Testing: Local testing, CI.
Reviewed By: Cyndy Ishida (cyndyishida)

I forgot to update the version info in the SDKSettings file when I
updated it to the real version relevant to the test.
…not correctly enabled for Mac Catalyst

Mac Catalyst is the iOS platform, but it builds against the macOS SDK and so it needs to be checking the macOS SDK version instead of the iOS one.
Add tests against a greater-than SDK version just to make sure this works beyond the initially supporting SDKs.

rdar://116490661
@ian-twilightcoder ian-twilightcoder force-pushed the builtin-modules-maccatalyst branch from c6a7b9e to a566c12 Compare August 20, 2024 16:57
@ian-twilightcoder
Copy link
Author

@swift-ci test llvm

@ian-twilightcoder
Copy link
Author

@swift-ci test

@ian-twilightcoder
Copy link
Author

LLVM errors are just the expected -emit-llvm-only ones.

@fredriss fredriss merged commit c3efe92 into swiftlang:swift/release/6.0 Aug 21, 2024
3 of 5 checks passed
@ian-twilightcoder ian-twilightcoder deleted the builtin-modules-maccatalyst branch December 23, 2024 23:30
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.

3 participants