diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-12 11:03:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 11:03:47 -0700 |
| commit | df9eda4fff2e367a04b293759829f5be25d9fa04 (patch) | |
| tree | b61d3e58b39c53abf35e9166a100541a14952b80 /toolsrc | |
| parent | 12ac3e9056d3216c30558bc542379a11af1fc9ae (diff) | |
| parent | 00d89dbd66a658174233920d6be2a85f282ef29f (diff) | |
| download | vcpkg-df9eda4fff2e367a04b293759829f5be25d9fa04.tar.gz vcpkg-df9eda4fff2e367a04b293759829f5be25d9fa04.zip | |
Merge pull request #1870 from Mixaill/arm64
[vcpkg] ARM64 support
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 1 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index a0699e15c..6d9a0da73 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -361,6 +361,7 @@ namespace vcpkg::PostBuildLint case MachineType::I386: return "x86"; case MachineType::ARM: case MachineType::ARMNT: return "arm"; + case MachineType::ARM64: return "arm64"; default: return "Machine Type Code = " + std::to_string(static_cast<uint16_t>(machine_type)); } } diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index d14002e47..dac9e40e7 100644 --- a/toolsrc/src/VcpkgPaths.cpp +++ b/toolsrc/src/VcpkgPaths.cpp @@ -370,10 +370,14 @@ namespace vcpkg supported_architectures.push_back({L"x86_amd64", CPU::X86, CPU::X64}); if (fs.exists(vcvarsall_dir / "vcvarsx86_arm.bat")) supported_architectures.push_back({L"x86_arm", CPU::X86, CPU::ARM}); + if (fs.exists(vcvarsall_dir / "vcvarsx86_arm64.bat")) + supported_architectures.push_back({L"x86_arm64", CPU::X86, CPU::ARM64}); if (fs.exists(vcvarsall_dir / "vcvarsamd64_x86.bat")) supported_architectures.push_back({L"amd64_x86", CPU::X64, CPU::X86}); if (fs.exists(vcvarsall_dir / "vcvarsamd64_arm.bat")) supported_architectures.push_back({L"amd64_arm", CPU::X64, CPU::ARM}); + if (fs.exists(vcvarsall_dir / "vcvarsamd64_arm64.bat")) + supported_architectures.push_back({L"amd64_arm64", CPU::X64, CPU::ARM64}); // Locate the "best" MSVC toolchain version const fs::path msvc_path = vc_dir / "Tools" / "MSVC"; |