diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2020-01-13 11:49:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 11:49:15 -0800 |
| commit | 9a510168c7102722fac448c0fe3c630d303e5d6e (patch) | |
| tree | dc1940519111b00f8015c199a90cc43f7c4084ab /toolsrc/src | |
| parent | e46a029bf727fa3347f1caec2dc26cef43ec3ac6 (diff) | |
| parent | ecf83936b291ca2a28f36d8e39d5b191f4b2b193 (diff) | |
| download | vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.tar.gz vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.zip | |
Merge branch 'master' into dev/jack/update_osx_baseline
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/base/system.cpp | 15 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index d9c6349be..c84b7f8be 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -157,11 +157,24 @@ namespace vcpkg std::vector<CPUArchitecture> supported_architectures; 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) { 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; } diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 2037e8d26..451f72445 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -662,7 +662,7 @@ namespace vcpkg::Build std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
// Sorted here as the order of dependency_abis is the only
- // non-deterministicly ordered set of AbiEntries
+ // non-deterministically ordered set of AbiEntries
Util::sort(abi_tag_entries);
// If there is an unusually large number of files in the port then
|