fix load tool

1 files changed, 4 insertions, 3 deletions

diff --git a/xmake/core/tool/compiler.lua b/xmake/core/tool/compiler.lua
index c610116c7..b20591d3c 100644
--- a/xmake/core/tool/compiler.lua
+++ b/xmake/core/tool/compiler.lua
@@ -153,9 +153,6 @@ function compiler.load(sourcekind, target)
     -- init flag kinds
     instance._FLAGKINDS = table.wrap(result:sourceflags()[sourcekind])
 
-    -- save this instance
-    compiler._INSTANCES[cachekey] = instance
-
     -- add toolchains flags to the compiler tool, e.g. gcc.cxflags or cxflags
     local toolname = compiler_tool:name()
     if target and target.toolconfig then
@@ -174,6 +171,10 @@ function compiler.load(sourcekind, target)
     if not ok then
         return nil, errors
     end
+
+    -- @note we have to save it after the load to avoid
+    -- other concurrent processes going ahead and getting an incomplete instance of the tool.
+    compiler._INSTANCES[cachekey] = instance
     return instance
 end