cache toolchain configs

2 files changed, 17 insertions, 36 deletions

diff --git a/xmake/toolchains/msvc/check.lua b/xmake/toolchains/msvc/check.lua
index 33cfc6298..f0fd5f2f6 100644
--- a/xmake/toolchains/msvc/check.lua
+++ b/xmake/toolchains/msvc/check.lua
@@ -28,13 +28,16 @@ import("lib.detect.find_tool")
 function _check_vsenv(toolchain)
 
     -- have been checked?
-    local vs = config.get("vs")
-    if vs and config.get("__vcvarsall") then
+    local vs = toolchain:config("vs") or config.get("vs")
+    local vcvars = toolchain:config("vcvars")
+    if vs and vcvars then
         return vs
     end
 
     -- find vstudio
-    local vstudio = find_vstudio({vcvars_ver = config.get("vs_toolset"), sdkver = config.get("vs_sdkver")})
+    local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
+    local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
+    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
@@ -52,15 +55,15 @@ function _check_vsenv(toolchain)
         -- get vcvarsall
         for _, vsver in ipairs(vsvers) do
             local vcvarsall = (vstudio[vsver] or {}).vcvarsall or {}
-            local vsenv = vcvarsall[toolchain:arch()]
-            if vsenv and vsenv.PATH and vsenv.INCLUDE and vsenv.LIB then
+            local vcvars = vcvarsall[toolchain:arch()]
+            if vcvars and vcvars.PATH and vcvars.INCLUDE and vcvars.LIB then
 
-                -- save vsenv
-                config.set("__vcvarsall", vcvarsall)
+                -- save vcvars
+                toolchain:config_set("vcvars", vcvars)
 
                 -- check compiler
                 local program = nil
-                local tool = find_tool("cl.exe", {force = true, envs = vsenv})
+                local tool = find_tool("cl.exe", {force = true, envs = vcvars})
                 if tool then
                     program = tool.program
                 end
@@ -76,7 +79,8 @@ end
 function _check_vstudio(toolchain)
     local vs = _check_vsenv(toolchain)
     if vs then
-        config.set("vs", vs, {readonly = true, force = true})
+        toolchain:config_set("vs", vs)
+        toolchain:configs_save()
         cprint("checking for Microsoft Visual Studio (%s) version ... ${color.success}%s", toolchain:arch(), vs)
     else
         cprint("checking for Microsoft Visual Studio (%s) version ... ${color.nothing}${text.nothing}", toolchain:arch())
diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua
index 3e6dd39d5..95ebe0cf1 100644
--- a/xmake/toolchains/msvc/load.lua
+++ b/xmake/toolchains/msvc/load.lua
@@ -26,37 +26,14 @@ import("detect.sdks.find_vstudio")
 -- add the given vs environment
 function _add_vsenv(toolchain, name)
 
-    -- get vcvarsall
-    local vcvarsall = config.get("__vcvarsall")
-    if not vcvarsall then
+    -- get vcvars
+    local vcvars = toolchain:config("vcvars")
+    if not vcvars then
         return
     end
 
-    -- get vs environment for the current arch
-    local arch = toolchain:arch()
-    local vsenv = vcvarsall[arch] or {}
-
-    -- switch vstudio environment if vs_sdkver has been changed
-    local switch_vsenv = false
-    local vs = config.get("vs")
-    local vs_sdkver = config.get("vs_sdkver")
-    if vs and vs_sdkver and vsenv.WindowsSDKVersion and vs_sdkver ~= vsenv.WindowsSDKVersion then
-        switch_vsenv = true
-    end
-    if switch_vsenv then
-        -- find vstudio
-        local vstudio = find_vstudio({vcvars_ver = config.get("vs_toolset"), sdkver = vs_sdkver})
-        if vstudio then
-            vcvarsall = (vstudio[vs] or {}).vcvarsall or {}
-            vsenv = vcvarsall[arch] or {}
-            if vsenv and vsenv.PATH and vsenv.INCLUDE and vsenv.LIB then
-                config.set("__vcvarsall", vcvarsall)
-            end
-        end
-    end
-
     -- get the paths for the vs environment
-    local new = vsenv[name]
+    local new = vcvars[name]
     if new then
         toolchain:add("runenvs", name:upper(), path.splitenv(new))
     end