summaryrefslogtreecommitdiff
path: root/xmake/tools/link.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-06-21 08:41:22 +0800
committerruki <[email protected]>2017-06-21 08:41:22 +0800
commit45a54659f7449ead7ed073f9c0cbbe1da9fcdc06 (patch)
treea09be69c75dce6435d7584ad467aeb51e3c8d37a /xmake/tools/link.lua
parentace13f7594d5dbddd771cfe0a4004bbcb506b11c (diff)
rename shellname to program
Diffstat (limited to 'xmake/tools/link.lua')
-rw-r--r--xmake/tools/link.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/tools/link.lua b/xmake/tools/link.lua
index aa99377fb..c79d67a2a 100644
--- a/xmake/tools/link.lua
+++ b/xmake/tools/link.lua
@@ -26,10 +26,10 @@
import("core.project.config")
-- init it
-function init(shellname, kind)
+function init(program, kind)
-- save the shell name
- _g.shellname = shellname or "link.exe"
+ _g.program = program or "link.exe"
-- save the tool kind
_g.kind = kind
@@ -109,13 +109,13 @@ end
function linkcmd(objectfiles, targetkind, targetfile, flags)
-- make it
- local cmd = format("%s %s -out:%s %s", _g.shellname, flags, targetfile, objectfiles)
+ local cmd = format("%s %s -out:%s %s", _g.program, flags, targetfile, objectfiles)
-- too long?
if #cmd > 4096 then
local argfile = targetfile .. ".arg"
io.printf(argfile, "%s -out:%s %s", flags, targetfile, objectfiles)
- cmd = format("%s @%s", _g.shellname, argfile)
+ cmd = format("%s @%s", _g.program, argfile)
end
-- ok?
@@ -154,7 +154,7 @@ function check(flags)
-- check it
os.run("cl -c -Fo%s %s", objectfile, sourcefile)
- os.run("%s %s -out:%s %s", _g.shellname, ifelse(flags, flags, ""), binaryfile, objectfile)
+ os.run("%s %s -out:%s %s", _g.program, ifelse(flags, flags, ""), binaryfile, objectfile)
-- remove files
os.rm(objectfile)