Skip to content
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

Persist FPU variables across try_compile passes #12817

Merged
merged 1 commit into from
Mar 23, 2023

Conversation

am11
Copy link
Member

@am11 am11 commented Mar 9, 2023

When -cmakeargs -DCLR_ARM_FPU_TYPE=vfpv4 is passed from command-line, the first pass to toolchain was failing the condition if (NOT DEFINED CLR_ARM_FPU_TYPE) as expected, but the second and subsequent passes were satisfying the condition. This is because how cmake invokes the toolchain file.

Append variables that we must persist across the passes to CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to override this behavior.

Contributes to dotnet/runtime#83170.

cc @janvorli

Copy link
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@am11
Copy link
Member Author

am11 commented Mar 23, 2023

@jkoritzinsky, I don't have write permission. Can you please merge this?

@janvorli
Copy link
Member

@am11 I am sorry for the delay with merging this, I was OOF and then sick for about two weeks. Merging now.

@janvorli
Copy link
Member

Oops, I cannot merge it due to the arcade-ci leg failure. It is now strictly required to be green to allow merging. Let me try to rerun the failed legs.

@janvorli janvorli enabled auto-merge (squash) March 23, 2023 13:04
@janvorli janvorli closed this Mar 23, 2023
auto-merge was automatically disabled March 23, 2023 13:05

Pull request was closed

@janvorli janvorli reopened this Mar 23, 2023
@janvorli janvorli merged commit 6aad78b into dotnet:main Mar 23, 2023
@am11
Copy link
Member Author

am11 commented Mar 23, 2023

@janvorli, thank you! Hope you are feeling well and healthy. 🙂

@am11 am11 deleted the feature/cross/toolchain branch March 23, 2023 14:43
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