From 3ee3a5b9a22cd7248f78dd8eb9aba9ced18f0849 Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Mon, 13 Mar 2017 14:52:05 +0000
Subject: [PATCH] Implemented mapping of MSVC to VS 2017 in build scripts.
---
build/scripts/LLVM.lua | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/build/scripts/LLVM.lua b/build/scripts/LLVM.lua
index 9371d985..12a8167f 100644
--- a/build/scripts/LLVM.lua
+++ b/build/scripts/LLVM.lua
@@ -47,19 +47,19 @@ function clone_llvm()
git.reset_hard(llvm, llvm_release)
git.reset_hard(clang, clang_release)
end
-
function get_vs_version()
- local function map_msvc_to_vs_version(ver)
- if ver == "19" then return "vs2015"
- elseif ver == "18" then return "vs2013"
- elseif ver == "17" then return "vs2012"
+ local function map_msvc_to_vs_version(major, minor)
+ if major == "19" and minor == "10" then return "vs2017"
+ elseif major == "19" then return "vs2015"
+ elseif major == "18" then return "vs2013"
+ elseif major == "17" then return "vs2012"
else error("Unknown MSVC compiler version, run in VS command prompt.") end
end
local out = outputof("cl")
- local ver, arch = string.match(out, '(%d+).%d+.%d+.?%d*%s+')
-
- return map_msvc_to_vs_version(ver)
+ local major, minor = string.match(out, '(%d+).(%d+).%d+.?%d*%s+')
+
+ return map_msvc_to_vs_version(major, minor)
end
function get_toolset_configuration_name()