add runenvs for cl/link

2 files changed, 10 insertions, 16 deletions

diff --git a/xmake/core/platform/environment.lua b/xmake/core/platform/environment.lua
index 8fc67bfac..888fe2148 100644
--- a/xmake/core/platform/environment.lua
+++ b/xmake/core/platform/environment.lua
@@ -45,16 +45,6 @@ function environment._enter_toolchains()
     if os.host() == "windows" then
         os.addenv("PATH", path.join(os.programdir(), "winenv", "bin"))
     end
-
-    --[[
-    -- add the runenvs of toolchains
-    for name, values in pairs(platform:runenvs()) do
-        if not oldenvs[name] then
-            oldenvs[name] = os.getenv(name)
-        end
-        os.addenv(name, table.unpack(table.wrap(values)))
-    end]]
-
     environment._OLDENVS_TOOLCHAINS = oldenvs
     return true
 end
diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua
index 39f88645f..d29c4d3a4 100644
--- a/xmake/core/platform/platform.lua
+++ b/xmake/core/platform/platform.lua
@@ -181,7 +181,7 @@ function _instance:tool(toolkind)
     end
 
     -- get tool program
-    local program, toolname
+    local program, toolname, toolchain_info
     local toolinfo = tools[toolkind]
     if toolinfo == nil then
         toolinfo = {}
@@ -191,15 +191,17 @@ function _instance:tool(toolkind)
             if program then
                 toolinfo[1] = program
                 toolinfo[2] = toolname
+                toolinfo[3] = {name = toolchain_inst:name(), plat = toolchain_inst:plat(), arch = toolchain_inst:arch()}
                 break
             end
         end
         tools[toolkind] = toolinfo
     else
-        program  = toolinfo[1]
-        toolname = toolinfo[2]
+        program        = toolinfo[1]
+        toolname       = toolinfo[2]
+        toolchain_info = toolinfo[3]
     end
-    return program, toolname
+    return program, toolname, toolchain_info
 end
 
 -- get tool configuration from the toolchains
@@ -503,6 +505,7 @@ function platform.tool(toolkind, plat)
     -- attempt to get program from config first
     local program = config.get(toolkind)
     local toolname = config.get("__toolname_" .. toolkind)
+    local toolchain_info = config.get("__toolchain_info_" .. toolkind)
     if program == nil then 
 
         -- get the current platform 
@@ -512,10 +515,11 @@ function platform.tool(toolkind, plat)
         end
 
         -- get it from the platform toolchains
-        program, toolname = instance:tool(toolkind)
+        program, toolname, toolchain_info = instance:tool(toolkind)
         if program then
             config.set(toolkind, program, {force = true, readonly = true})
             config.set("__toolname_" .. toolkind, toolname)
+            config.set("__toolchain_info_" .. toolkind, toolchain_info)
             config.save()
         end
     end
@@ -528,7 +532,7 @@ function platform.tool(toolkind, plat)
             program = program:sub(pos + 1)
         end
     end
-    return program, toolname
+    return program, toolname, toolchain_info
 end
 
 -- get the given tool configuration