diff options
| author | ruki <[email protected]> | 2023-01-04 13:24:36 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-04 13:24:36 +0800 |
| commit | b71def1cc032329edeeda97cdefec3eb65e101cc (patch) | |
| tree | 779059ea475e676fc4bb0c0a92e543620e70b846 /xmake/modules/core/tools/link.lua | |
| parent | ff4fb0bbf49a490bfe51dcb29b7d02a82350ad63 (diff) | |
| parent | 8401a29cdc083b2fe1eb9e89c0a6cc91e334a4c4 (diff) | |
Merge pull request #3237 from xmake-io/masm32
Add masm32 toolchain
Diffstat (limited to 'xmake/modules/core/tools/link.lua')
| -rw-r--r-- | xmake/modules/core/tools/link.lua | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua index b5ee775af..38ce20a83 100644 --- a/xmake/modules/core/tools/link.lua +++ b/xmake/modules/core/tools/link.lua @@ -140,9 +140,14 @@ function link(self, objectfiles, targetkind, targetfile, flags, opt) { function () - -- use vstool to link and enable vs_unicode_output @see https://github.com/xmake-io/xmake/issues/528 + local toolchain = self:toolchain() local program, argv = linkargv(self, objectfiles, targetkind, targetfile, flags, opt) - vstool.runv(program, argv, {envs = self:runenvs()}) + if toolchain and toolchain:name() == "masm32" then + os.iorunv(program, argv, {envs = self:runenvs()}) + else + -- use vstool to link and enable vs_unicode_output @see https://github.com/xmake-io/xmake/issues/528 + vstool.runv(program, argv, {envs = self:runenvs()}) + end end, catch { |