Skip to content

[build] Do not override macOS deployment target when macCatalyst is enabled #76124

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
Aug 30, 2024

Conversation

egorzhdan
Copy link
Contributor

Cxx.swiftmodule should built with a macOS deployment target set to 10.9, the minimum possible version. Since we enabled macCatalyst for this target, it inadvertently started being built with a deployment target set to 13.0, which is too new and is causing build errors in certain projects.

This change makes sure that for Swift targets within the Swift project that explicitly specify DEPLOYMENT_VERSION_OSX, the macCatalyst build logic doesn't silently discard this flag.

rdar://133008827

…nabled

Cxx.swiftmodule should built with a macOS deployment target set to 10.9, the minimum possible version. Since we enabled macCatalyst for this target, it inadvertently started being built with a deployment target set to 13.0, which is too new and is causing build errors in certain projects.

This change makes sure that for Swift targets within the Swift project that explicitly specify `DEPLOYMENT_VERSION_OSX`, the macCatalyst build logic doesn't silently discard this flag.

rdar://133008827
@egorzhdan egorzhdan added the c++ interop Feature: Interoperability with C++ label Aug 28, 2024
@egorzhdan egorzhdan requested review from etcwilde and tshortli August 28, 2024 14:39
@egorzhdan
Copy link
Contributor Author

@swift-ci please test

@egorzhdan
Copy link
Contributor Author

@swift-ci please test Windows

1 similar comment
@egorzhdan
Copy link
Contributor Author

@swift-ci please test Windows

@egorzhdan egorzhdan requested a review from edymtt August 29, 2024 14:39
@egorzhdan egorzhdan merged commit ec09fa7 into main Aug 30, 2024
5 checks passed
@egorzhdan egorzhdan deleted the egorzhdan/maccatalyst-deployment-target branch August 30, 2024 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ interop Feature: Interoperability with C++
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants