[nativeaot] Fix native bits build when targeting "cross" architecture iOS platforms #88079
Conversation
…rms with Native AOT
kotlarmilos
requested review from
steveisok,
akoeplinger,
JeremyKuhne and
MichalStrehovsky
kotlarmilos
changed the title
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas Issue DetailsThis PR aims to fix the official build when targeting "cross" architecture. Initially, the change was tested locally when targeting the same architecture. Resolves #87985 (comment)
|
|
/azp list |
This comment was marked as resolved.
This comment was marked as resolved.
src/coreclr/crosscomponents.cmake
Outdated
| @@ -1,5 +1,5 @@ | |||
| # Add targets to the crosscomponents subcomponent build | |||
| if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) | |||
| if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST) | |||
There was a problem hiding this comment.
@jkoritzinsky could you also have a look at this? This doesn't look wrong to me but I'm not sure I understand why all of this is under if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) to begin with.
There was a problem hiding this comment.
(Maybe we can merge as-is since this is to unblock official builds, but I'd like Jeremy to also see this once Seattle wakes up.)
There was a problem hiding this comment.
I would rather revert the previous PR than rushing with this change until we confirm it is properly implemented.
There was a problem hiding this comment.
I think no changes are needed in the src/coreclr/crosscomponents.cmake.
|
The official build jobs have passed: https://dev.azure.com/dnceng/internal/_build/results?buildId=2210149&view=results |
|
Merging it to unblock the official builds. @jkoritzinsky please take a look and we can update it in a follow-up PR if needed. |
ghost
locked as resolved and limited conversation to collaborators
This PR aims to fix the official build when targeting "cross" architecture iOS platforms. Initially, the change #87985 was tested locally when targeting the same architecture.
Resolves #87985 (comment)