diff options
| author | ruki <[email protected]> | 2020-08-15 23:18:56 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-08-15 23:18:56 +0800 |
| commit | b12320f81e7badd3d181555fe094ab0f4015a3f2 (patch) | |
| tree | 6b778fcce183f26e619aa1ab63cdde4883f1ccfd /xmake/modules/detect/tools | |
| parent | 5c3712c3f7940af3cce30016f259cb55f874d6a2 (diff) | |
fix path for msvc/2008 on xp
Diffstat (limited to 'xmake/modules/detect/tools')
| -rw-r--r-- | xmake/modules/detect/tools/find_cl.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/detect/tools/find_link.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/detect/tools/find_rc.lua | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/xmake/modules/detect/tools/find_cl.lua b/xmake/modules/detect/tools/find_cl.lua index a6f5d2fa6..b0ca7fa4b 100644 --- a/xmake/modules/detect/tools/find_cl.lua +++ b/xmake/modules/detect/tools/find_cl.lua @@ -46,12 +46,10 @@ function main(opt) -- find program version local version = nil if program and opt and opt.version then - opt.command = opt.command or function () local _, info = os.iorun(program); return info end + opt.command = opt.command or function () local _, info = os.iorunv(program, {}, {envs = opt.envs}); return info end opt.parse = opt.parse or function (output) return output:match("Version (%d+%.?%d*%.?%d*.-)%s") end version = find_programver(program, opt) end - - -- ok? return program, version end diff --git a/xmake/modules/detect/tools/find_link.lua b/xmake/modules/detect/tools/find_link.lua index 5814cba09..dd6c6a24a 100644 --- a/xmake/modules/detect/tools/find_link.lua +++ b/xmake/modules/detect/tools/find_link.lua @@ -43,7 +43,7 @@ function main(opt) -- init options opt = opt or {} opt.check = opt.check or function (program) - + -- find cl local cl = assert(find_tool("cl", {envs = opt.envs})) diff --git a/xmake/modules/detect/tools/find_rc.lua b/xmake/modules/detect/tools/find_rc.lua index aa205c187..372417b17 100644 --- a/xmake/modules/detect/tools/find_rc.lua +++ b/xmake/modules/detect/tools/find_rc.lua @@ -78,8 +78,6 @@ function main(opt) if program and opt and opt.version then version = find_programver(program, opt) end - - -- ok? return program, version end |
