fix link errors output

1 files changed, 23 insertions, 2 deletions

diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua
index c9df9c630..b45f3c7a9 100644
--- a/xmake/modules/core/tools/link.lua
+++ b/xmake/modules/core/tools/link.lua
@@ -113,7 +113,28 @@ function link(self, objectfiles, targetkind, targetfile, flags, opt)
     -- ensure the target directory
     os.mkdir(path.directory(targetfile))
 
-    -- use vstool to link and enable vs_unicode_output @see https://github.com/xmake-io/xmake/issues/528
-    vstool.runv(linkargv(self, objectfiles, targetkind, targetfile, flags, opt))
+    try
+    {
+        function ()
+    
+            -- use vstool to link and enable vs_unicode_output @see https://github.com/xmake-io/xmake/issues/528
+            vstool.runv(linkargv(self, objectfiles, targetkind, targetfile, flags, opt))
+        end,
+        catch
+        {
+            function (errors)
+
+                -- use link/stdout as errors first from vstool.iorunv()
+                if type(errors) == "table" then
+                    local errs = errors.stdout or ""
+                    if #errs:trim() == 0 then
+                        errs = errors.stderr or ""
+                    end
+                    errors = errs
+                end
+                os.raise(tostring(errors))
+            end
+        }
+    }
 end