aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-17 07:59:45 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-17 07:59:45 +0200
commit12488e8a3f4a5f558664918444d9e999a2edf9ad (patch)
tree46360cffeffd5d099b5eb223f13ee0b7ee6051b6
parenta90b3e721d02573fa4ceaf859305ce9c72a830f6 (diff)
Add temporary fallback to x64 in find_msvc()
-rw-r--r--libbuild2/cc/guess.cxx11
1 files changed, 8 insertions, 3 deletions
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