diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 15:42:17 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 15:42:17 -0700 |
| commit | 54602eb4446a67387933edaa69c9524ca5f05aa7 (patch) | |
| tree | b4cd9823608f5da6779f8cb6abd192e33af8991e /toolsrc/src | |
| parent | 05b47002ebbf99561476564cb9dfe1869cb79c7c (diff) | |
| download | vcpkg-54602eb4446a67387933edaa69c9524ca5f05aa7.tar.gz vcpkg-54602eb4446a67387933edaa69c9524ca5f05aa7.zip | |
Revert toolchain selection behavior
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg_Build.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp index ccc0ff95e..30c4fec3e 100644 --- a/toolsrc/src/vcpkg_Build.cpp +++ b/toolsrc/src/vcpkg_Build.cpp @@ -59,12 +59,13 @@ 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_arch == value.target_arch && host_arch == value.host_arch) + if (target_architecture == Strings::to_utf8(value.name)) { return value.name; } |