From 12488e8a3f4a5f558664918444d9e999a2edf9ad Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 17 Oct 2019 07:59:45 +0200
Subject: Add temporary fallback to x64 in find_msvc()

---
 libbuild2/cc/guess.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'libbuild2')

diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index bba3a35..80ee84e 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -425,8 +425,8 @@ namespace build2
     {
       dir_path msvc_dir; // VC directory (...\Tools\MSVC\<ver>\).
       string   msvc_cpu; // Target CPU (x86, x64) or empty if unknown.
-      string   psdk_ver; // Platfor SDK directory (...\Windows Kits\<ver>\).
       dir_path psdk_dir; // Platfor SDK version (under Include/, Lib/, etc).
+      string   psdk_ver; // Platfor SDK directory (...\Windows Kits\<ver>\).
     };
 
 #if defined(_WIN32) && !defined(BUILD2_BOOTSTRAP)
@@ -473,12 +473,17 @@ namespace build2
     // @@ TODO: if (cl.sub (r.msvc_dir)), msvc_cpu derivation.
     //
     static optional<msvc_info>
-    find_msvc (const path& /*cl*/ =  path ())
+    find_msvc (const path& cl =  path ())
     {
       using namespace butl;
 
       msvc_info r;
 
+      // @@ TMP
+      //
+      if (!cl.empty ())
+        r.msvc_cpu = "x64";
+
       // Try to obtain the latest MSVC directory and version.
       //
       {
@@ -707,7 +712,7 @@ namespace build2
           return nullopt;
       }
 
-      return move (r);
+      return r;
     }
 #endif
 
-- 
cgit v1.1