Skip to content

Fix building CoreCLR for x86 with the Windows 10.0.20348.0 SDK - #57067

Merged
jkoritzinsky merged 1 commit into
dotnet:mainfrom
jkoritzinsky:x86-new-windows-sdk
Aug 9, 2021
Merged

Fix building CoreCLR for x86 with the Windows 10.0.20348.0 SDK#57067
jkoritzinsky merged 1 commit into
dotnet:mainfrom
jkoritzinsky:x86-new-windows-sdk

Conversation

@jkoritzinsky

Copy link
Copy Markdown
Member

The SDK now defines CONTEXT_UNWOUND_TO_CALL in more cases, so we get a macro redefinition error. Since the SDK defines it to the same value as we do, just skip our definition if it's already defined.

The SDK now defines CONTEXT_UNWOUND_TO_CALL in more cases, so we get a macro redefinition error. Since the SDK defines it to the same value as we do, just skip our definition if it's already defined.
@ghost

ghost commented Aug 9, 2021

Copy link
Copy Markdown

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@jkoritzinskyjkoritzinsky added the area-Infrastructure-coreclr Only use for closed issues label Aug 9, 2021
@ghost

ghost commented Aug 9, 2021

Copy link
Copy Markdown

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

Issue Details

The SDK now defines CONTEXT_UNWOUND_TO_CALL in more cases, so we get a macro redefinition error. Since the SDK defines it to the same value as we do, just skip our definition if it's already defined.

Author:jkoritzinsky
Assignees:-
Labels:

area-Infrastructure-coreclr

Milestone:-

@tannergoodingtannergooding left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This also resolves the same issue with the Win11 SDK

@jkoritzinsky

Copy link
Copy Markdown
MemberAuthor

Failure is the xunit collection bug in the test runner.

@jkoritzinsky
jkoritzinsky merged commit ce4bf13 into dotnet:mainAug 9, 2021
@jkoritzinsky
jkoritzinsky deleted the x86-new-windows-sdk branch August 9, 2021 20:36
@ghostghost locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-coreclrOnly use for closed issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@jkoritzinsky@tannergooding