diff options
Diffstat (limited to 'xmake/modules/detect/tools/find_lib.lua')
| -rw-r--r-- | xmake/modules/detect/tools/find_lib.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xmake/modules/detect/tools/find_lib.lua b/xmake/modules/detect/tools/find_lib.lua index 2b65c978b..653dca5bb 100644 --- a/xmake/modules/detect/tools/find_lib.lua +++ b/xmake/modules/detect/tools/find_lib.lua @@ -21,6 +21,7 @@ -- imports import("lib.detect.find_program") import("lib.detect.find_programver") +import("lib.detect.find_tool") -- find lib -- @@ -50,8 +51,10 @@ function main(opt) io.writefile(sourcefile, "int test(void)\n{return 0;}") -- check it - os.runv("cl", {"-c", "-Fo" .. objectfile, sourcefile}, {envs = opt.envs}) - os.runv("link", {"-lib", "-out:" .. libraryfile, objectfile}, {envs = opt.envs}) + local cl = assert(find_tool("cl")) + local link = assert(find_tool("link")) + os.runv(cl.program, {"-c", "-Fo" .. objectfile, sourcefile}, {envs = opt.envs}) + os.runv(link.program, {"-lib", "-out:" .. libraryfile, objectfile}, {envs = opt.envs}) verinfo = os.iorunv(program, {"-list", libraryfile}, {envs = opt.envs}) -- remove files |