[mono] Fix iOS/tvOS build with Xcode 14 #76433
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.
akoeplinger
requested review from
lambdageek,
vargaz and
marek-safar
as code owners
ghost
assigned 
lambdageek
approved these changes
Sep 30, 2022
|
wasm failures are #76429 |
|
The failures are known issues. |
|
/backport to release/7.0 |
|
/backport to release/6.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3159385932 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3159386632 |
|
@akoeplinger backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [mono] Fix iOS/tvOS build with Xcode 14
Using index info to reconstruct a base tree...
M src/mono/cmake/config.h.in
M src/mono/cmake/configure.cmake
M src/mono/mono/utils/mono-threads-mach-helper.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/utils/mono-threads-mach-helper.c
Auto-merging src/mono/cmake/configure.cmake
Auto-merging src/mono/cmake/config.h.in
CONFLICT (content): Merge conflict in src/mono/cmake/config.h.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [mono] Fix iOS/tvOS build with Xcode 14
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Sep 30, 2022
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
carlossanlop
pushed a commit
that referenced
this pull request
Oct 5, 2022
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
|
/azp run sync-runtime-to-mono |
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.
Before Xcode 14 the
objc_superstruct definition in the SDK headers looked like this: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.