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

Allow vcpkg to be built arm64ec. #1319

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Conversation

BillyONeal
Copy link
Member

We have no reason to build vcpkg as arm64ec, but the C++ compiler team have asked us to make this work since they use us as a test case.

Unfortunately, CMake's defaults ( https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Windows-MSVC.cmake#L243 ) take the pretty names AMD64 and ARM64EC which we use in the COFF file reader. This removes those defines.

Thanks to Wei Lin Wang for the bug report and @markle11m for help.

We have no reason to build vcpkg as arm64ec, but the C++ compiler team have asked us to make this work since they use us as a test case.

Unfortunately, CMake's defaults ( https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Windows-MSVC.cmake#L243 ) take the pretty names AMD64 and ARM64EC which we use in the COFF file reader. This removes those defines.
Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

I am a little bit concerned about the potential for standard library headers to react to these macros, but otherwise LGTM.

@BillyONeal
Copy link
Member Author

I am a little bit concerned about the potential for standard library headers to react to these macros, but otherwise LGTM.

Standard library headers look at the _M_Xxx predefined macros, not these ones CMake happens to set.

@BillyONeal BillyONeal merged commit 2aa3a71 into microsoft:main Jan 10, 2024
5 checks passed
@BillyONeal BillyONeal deleted the arm64ec branch January 29, 2024 22:26
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.

2 participants