diff options
| author | ruki <[email protected]> | 2020-06-20 22:59:15 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-06-20 22:59:15 +0800 |
| commit | 4db557bedf4839f2c09b5104a834e57b1d369071 (patch) | |
| tree | c975038902c69c92873170428b2ae269e185262f | |
| parent | 550f5225b01a3c3c0c88bc2c702d38c667b28528 (diff) | |
fix vstool
| -rw-r--r-- | xmake/modules/private/tools/vstool.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xmake/modules/private/tools/vstool.lua b/xmake/modules/private/tools/vstool.lua index c8f51b11b..b53758838 100644 --- a/xmake/modules/private/tools/vstool.lua +++ b/xmake/modules/private/tools/vstool.lua @@ -31,8 +31,7 @@ function runv(program, argv, opt) -- enable unicode output for vs toolchains, e.g. cl.exe, link.exe and etc. -- @see https://github.com/xmake-io/xmake/issues/528 - opt.envs = opt.envs or {} - opt.envs.VS_UNICODE_OUTPUT = outfile:rawfd() + opt.envs = table.join(opt.envs or {}, {VS_UNICODE_OUTPUT = outfile:rawfd()}) -- execute it local ok, syserrors = os.execv(program, argv, table.join(opt, {try = true, stdout = outfile, stderr = errpath})) @@ -94,8 +93,7 @@ function iorunv(program, argv, opt) -- enable unicode output for vs toolchains, e.g. cl.exe, link.exe and etc. -- @see https://github.com/xmake-io/xmake/issues/528 - opt.envs = opt.envs or {} - opt.envs.VS_UNICODE_OUTPUT = outfile:rawfd() + opt.envs = table.join(opt.envs or {}, {VS_UNICODE_OUTPUT = outfile:rawfd()}) -- run command local ok, syserrors = os.execv(program, argv, table.join(opt, {try = true, stdout = outfile, stderr = errpath})) |