diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-04 23:52:56 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-04 23:52:56 -0700 |
| commit | e4c5ef656607a1165566b338f5a85f907a627f86 (patch) | |
| tree | ddaf4c41728ca5da0433f998e4c7dd353ab629f8 /toolsrc/src/vcpkg_Build.cpp | |
| parent | ef149c7c4b8852916cf863598ce17ead9602641b (diff) | |
| download | vcpkg-e4c5ef656607a1165566b338f5a85f907a627f86.tar.gz vcpkg-e4c5ef656607a1165566b338f5a85f907a627f86.zip | |
[vcpkg] Revert Revert toolchain selection behavior
Diffstat (limited to 'toolsrc/src/vcpkg_Build.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Build.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp index 30c4fec3e..ccc0ff95e 100644 --- a/toolsrc/src/vcpkg_Build.cpp +++ b/toolsrc/src/vcpkg_Build.cpp @@ -59,13 +59,12 @@ namespace vcpkg::Build static constexpr std::array<ArchOption, 8> VALUES = { X86, X86_X64, X86_ARM, X86_ARM64, X64, X64_X86, X64_ARM, X64_ARM64}; - // auto target_arch = System::to_cpu_architecture(target_architecture); - // auto host_arch = System::get_host_processor(); + auto target_arch = System::to_cpu_architecture(target_architecture); + auto host_arch = System::get_host_processor(); for (auto&& value : VALUES) { - // if (target_arch == value.target_arch && host_arch == value.host_arch) - if (target_architecture == Strings::to_utf8(value.name)) + if (target_arch == value.target_arch && host_arch == value.host_arch) { return value.name; } |