diff options
| author | ruki <[email protected]> | 2016-04-28 11:14:04 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-04-28 11:14:04 +0800 |
| commit | 3571f65949d94560efbb2ae26703e0f5ac8a5f13 (patch) | |
| tree | 270eccf3ff12e44673fde8bcb0bc5c5a0dc93682 /xmake/tools/make.lua | |
| parent | 52eb26701de17e800ae69cc495ac665a39d5d1dd (diff) | |
add link and nmake tools for windows
Diffstat (limited to 'xmake/tools/make.lua')
| -rw-r--r-- | xmake/tools/make.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/tools/make.lua b/xmake/tools/make.lua index a95685478..0fe4a727a 100644 --- a/xmake/tools/make.lua +++ b/xmake/tools/make.lua @@ -56,7 +56,7 @@ function run(makefile, target, jobs) local verbose = ifelse(option.get("verbose"), "-v", "") -- run it - local ok = nil + local ok = -1 if makefile and os.isfile(makefile) then ok = os.execute("%s -r %s -f %s %s VERBOSE=%s", _g.shellname, jobs, makefile, target or "", verbose) else @@ -86,12 +86,12 @@ end function check(flags) -- make an empty makefile - local tmpfile = path.join(os.tmpdir(), "xmake.checker.make") - io.write(tmpfile, "all:\n") + local makefile = path.join(os.tmpdir(), "xmake.checker.make") + io.write(makefile, "all:\n") -- check it - os.run("%s %s -f %s", _g.shellname, ifelse(flags, flags, ""), tmpfile) + os.run("%s %s -f %s", _g.shellname, ifelse(flags, flags, ""), makefile) -- remove this makefile - os.rm(tmpfile) + os.rm(makefile) end |