fix load tool cache

Author: waruqi

xmake/core/tool/compiler.lua

@@ -122,17 +122,18 @@ function compiler.load(sourcekind, target)
         return nil, "unknown source kind!"
     end
 
-    -- load compiler tool first (with cache)
-    local compiler_tool, program_or_errors = compiler._load_tool(sourcekind, target)
-    if not compiler_tool then
-        return nil, program_or_errors
-    end
-
     -- init cache key
     -- @note we need plat/arch,
     -- because it is possible for the compiler to do cross-compilation with the -target parameter
-    local plat = compiler_tool:plat() or config.plat() or os.host()
-    local arch = compiler_tool:arch() or config.arch() or os.arch()
+    local plat = config.plat() or os.host()
+    local arch = config.arch() or os.arch()
+    if target and target.tool then
+        local _, _, toolchain_info = target:tool(sourcekind)
+        if toolchain_info then
+            plat = toolchain_info.plat
+            arch = toolchain_info.arch
+        end
+    end
     local cachekey = sourcekind .. (program_or_errors or "") .. plat .. arch
     if target then
         cachekey = cachekey .. tostring(target)
@@ -143,6 +144,13 @@ function compiler.load(sourcekind, target)
     local instance = compiler._INSTANCES[cachekey]
     if not instance then
         instance = table.inherit(compiler, builder)
+
+        -- load compiler tool
+        -- @NOTE We cannot cache the tool, otherwise it may cause duplicate toolchain flags to be added
+        local compiler_tool, program_or_errors = compiler._load_tool(sourcekind, target)
+        if not compiler_tool then
+            return nil, program_or_errors
+        end
         instance._TOOL = compiler_tool
 
         -- load the compiler language from the source kind
@@ -188,7 +196,7 @@ function compiler.load(sourcekind, target)
 
     -- we need to load it at the end because in tool.load().
     -- because we may need to call has_flags, which requires the full platform toolchain flags
-    local ok, errors = compiler_tool:_load_once()
+    local ok, errors = instance:_tool():_load_once()
     if not ok then
         return nil, errors
     end

xmake/core/tool/linker.lua

@@ -130,7 +130,8 @@ function linker.load(targetkind, sourcekinds, target)
         end
     end
 
-    -- load linker tool first (with cache)
+    -- load linker tool first, we need to get the correct plat/arch
+    -- @NOTE We cannot cache the tool, otherwise it may cause duplicate toolchain flags to be added
     local linkertool, linkerinfo_or_errors = linker._load_tool(targetkind, sourcekinds, target)
     if not linkertool then
         return nil, linkerinfo_or_errors
@@ -218,7 +219,7 @@ function linker.load(targetkind, sourcekinds, target)
 
     -- we need to load it at the end because in tool.load().
     -- because we may need to call has_flags, which requires the full platform toolchain flags
-    local ok, errors = linkertool:_load_once()
+    local ok, errors = instance:_tool():_load_once()
     if not ok then
         return nil, errors
     end

xmake/core/tool/tool.lua

@@ -241,22 +241,8 @@ function tool.load(kind, opt)
     local toolchain_info = opt.toolchain_info or {}
 
     -- get platform and architecture
-    local plat = toolchain_info.plat or config.get("plat") or os.host()
-    local arch = toolchain_info.arch or config.get("arch") or os.arch()
-
-    -- init cachekey
-    local cachekey = kind .. (program or "") .. plat .. arch .. (opt.host and "host" or "")
-    if toolchain_info and toolchain_info.cachekey then
-        -- it maybe contains target key
-        -- @see https://github.com/xmake-io/xmake/issues/6672
-        cachekey = cachekey .. toolchain_info.cachekey
-    end
-
-    -- get it directly from cache dirst
-    tool._TOOLS = tool._TOOLS or {}
-    if tool._TOOLS[cachekey] then
-        return tool._TOOLS[cachekey]
-    end
+    local plat = toolchain_info.plat or config.plat() or os.host()
+    local arch = toolchain_info.arch or config.arch() or os.arch()
 
     -- contain toolname? parse it, e.g. '[email protected]'
     if program then
@@ -310,7 +296,6 @@ function tool.load(kind, opt)
     if not instance then
         return nil, errors
     end
-    tool._TOOLS[cachekey] = instance
     return instance
 end