summaryrefslogtreecommitdiff
path: root/xmake/modules/detect/tools
diff options
context:
space:
mode:
authorruki <[email protected]>2023-01-04 22:46:10 +0800
committerruki <[email protected]>2023-01-04 22:46:10 +0800
commit5c8e06ac7c787f5127a8a109c5964aac561bf071 (patch)
treefdecc700b2f59ae4b036dc095ce11f20950e8943 /xmake/modules/detect/tools
parentff4fb0bbf49a490bfe51dcb29b7d02a82350ad63 (diff)
add masm32 sdk
Diffstat (limited to 'xmake/modules/detect/tools')
-rw-r--r--xmake/modules/detect/tools/find_link.lua6
-rw-r--r--xmake/modules/detect/tools/find_ml.lua2
2 files changed, 2 insertions, 6 deletions
diff --git a/xmake/modules/detect/tools/find_link.lua b/xmake/modules/detect/tools/find_link.lua
index 0fcff08f0..0c2abae7b 100644
--- a/xmake/modules/detect/tools/find_link.lua
+++ b/xmake/modules/detect/tools/find_link.lua
@@ -39,9 +39,10 @@ function main(opt)
-- init version info first
local version = nil
+ local verinfo = nil
-- init options
- opt = opt or {}
+ opt = opt or {}
opt.check = opt.check or function (program)
-- find cl
@@ -68,15 +69,12 @@ function main(opt)
opt.parse = opt.parse or function (output) return output:match("Version (%d+%.?%d*%.?%d*.-)%s") end
-- find program
- local verinfo = nil
local program = find_program(opt.program or "link.exe", opt)
-- find program version
if program and opt and opt.version then
version = find_programver(program, opt)
end
-
- -- ok?
return program, version
end
diff --git a/xmake/modules/detect/tools/find_ml.lua b/xmake/modules/detect/tools/find_ml.lua
index beeab79d7..75999f45a 100644
--- a/xmake/modules/detect/tools/find_ml.lua
+++ b/xmake/modules/detect/tools/find_ml.lua
@@ -50,8 +50,6 @@ function main(opt)
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