diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-10 23:13:46 +0300 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-14 12:57:28 +0200 |
commit | 2671496db7c3996a6d8467360979f3085375c6df (patch) | |
tree | 281531a27acfdd4a929f19b6b35ce2a94bfc9633 /libbuild2/utility.ixx | |
parent | 19e1b71a396e6b82c8e8a4602446ada0173579b9 (diff) |
Implement MSVC installation discovery for version 15 (2017) and later
In particular, this removes the requirement to build from the Visual Studio
command prompt. Note that since MSVC compiler binaries are target-specific
(i.e., there are no -m32/-m64 options nor something like /MACHINE), in this
case we default to a 64-bit build (a 32-bit build can still be achieved by
running from a suitable command prompt).
Finally, this mechanism is also used to find Clang bundled with MSVC.
Diffstat (limited to 'libbuild2/utility.ixx')
-rw-r--r-- | libbuild2/utility.ixx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/utility.ixx b/libbuild2/utility.ixx index 8d3f6ba..dcfd128 100644 --- a/libbuild2/utility.ixx +++ b/libbuild2/utility.ixx @@ -38,9 +38,9 @@ namespace build2 template <typename T> inline void - hash_options (sha256& csum, T& s, const variable& var) + append_options (sha256& csum, T& s, const variable& var) { - hash_options (csum, s[var]); + append_options (csum, s[var]); } template <typename T> @@ -59,9 +59,9 @@ namespace build2 template <typename T> inline void - hash_options (sha256& csum, T& s, const char* var) + append_options (sha256& csum, T& s, const char* var) { - hash_options (csum, s[var]); + append_options (csum, s[var]); } inline void @@ -79,10 +79,10 @@ namespace build2 } inline void - hash_options (sha256& csum, const strings& sv) + append_options (sha256& csum, const strings& sv) { if (size_t n = sv.size ()) - hash_options (csum, sv, n); + append_options (csum, sv, n); } template <typename T> |