-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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 #83206
Conversation
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsWhen Append variables we must persist across the passes to Second issue was that we weren't propagating cmakeargs in Fixes #83170.
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsWhen Append variables we must persist across the passes to Second issue was that we weren't propagating cmakeargs in Fixes #83170.
|
@janvorli PTAL. Trying to avoid merge conflicts with other PRs changing these lines. :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thank you! I have thought that I have already approved this, but obviously I was daydreaming.
When
-cmakeargs -DCLR_ARM_FPU_TYPE=vfpv4
is passed from command-line, the first pass to toolchain was failing the conditionif (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 the must persist across the passes to
CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
to override this behavior.Second issue was that we weren't propagating cmakeargs in
corehost.proj
andbuild-native.proj
properly; missing-cmakeargs
argument name. Note thatsrc/coreclr/runtime.proj
already handles it.Fixes #83170.
Upstream PR dotnet/arcade#12817