[release/6.0][mono] Fix iOS/tvOS build with Xcode 14 #76448
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Before Xcode 14 the `objc_super` struct definition in the SDK headers looked like this:
```
#if !defined(__cplusplus) && !__OBJC2__
/* For compatibility with old objc-runtime.h header */
__unsafe_unretained _Nonnull Class class;
#else
__unsafe_unretained _Nonnull Class super_class;
#endif
```
With Xcode 14 however the iOS/tvOS SDK header was changed to only define `super_class`, but the MacOSX SDK stayed the same.
Added CMake detection of this case so we can compile both on older and newer Xcode SDKs across platforms.
(cherry picked from commit d6f4ee1)
# Conflicts:
# src/mono/cmake/config.h.in
akoeplinger
requested review from
lambdageek,
vargaz and
marek-safar
as code owners
ghost
assigned
akoeplinger
added
Servicing-consider
akoeplinger
changed the title
steveisok
approved these changes
Sep 30, 2022
|
@carlossanlop since this is a build change, I think it can go right in after CI completes. Can you merge it for us? |
lambdageek
approved these changes
Sep 30, 2022
rbhanda
added
Servicing-approved
|
Approved, signed off, CI green. No OOB package authoring changes needed. Ready to merge. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #76433 to release/6.0
Customer Impact
This impacts our official build, without it we can't build iOS/tvOS with Xcode 14 as soon as it rolls out to AzDO.
Testing
Local tests with Xcode 14 confirmed it fixes the issue.
Risk
Low.
IMPORTANT: Is this backport for a servicing release? If so and this change touches code that ships in a NuGet package, please make certain that you have added any necessary package authoring and gotten it explicitly reviewed.