mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:26:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow ARM64 to build x86 things (#9578)

Browse Source
This commit is contained in:
Curtis J Bezault 2020-01-09 14:27:03 -08:00 committed by Victor Romero
parent 1488c8ea79
commit 7b61b7b515
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
toolsrc/src/vcpkg/base/system.cpp
View File

@ -157,11 +157,24 @@ namespace vcpkg
std::vector<CPUArchitecture> supported_architectures; std::vector<CPUArchitecture> supported_architectures;
supported_architectures.push_back(get_host_processor()); supported_architectures.push_back(get_host_processor());
// AMD64 machines support to run x86 applications // AMD64 machines support running x86 applications and ARM64 machines support running ARM applications
if (supported_architectures.back() == CPUArchitecture::X64) if (supported_architectures.back() == CPUArchitecture::X64)
{ {
supported_architectures.push_back(CPUArchitecture::X86); supported_architectures.push_back(CPUArchitecture::X86);
} }
else if (supported_architectures.back() == CPUArchitecture::ARM64)
{
supported_architectures.push_back(CPUArchitecture::ARM);
}
#if defined(_WIN32)
// On ARM32/64 Windows we can rely on x86 emulation
if (supported_architectures.front() == CPUArchitecture::ARM ||
supported_architectures.front() == CPUArchitecture::ARM64)
{
supported_architectures.push_back(CPUArchitecture::X86);
}
#endif
return supported_architectures; return supported_architectures;
} }