From e4c5ef656607a1165566b338f5a85f907a627f86 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 4 May 2017 23:52:56 -0700 Subject: [vcpkg] Revert Revert toolchain selection behavior --- toolsrc/src/vcpkg_Build.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'toolsrc/src') 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 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; } -- cgit v1.2.3