summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/makefile.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-18 13:41:23 +0800
committerruki <[email protected]>2015-06-18 13:41:23 +0800
commita2037440e4b4211fc67e602d62ab2d598bfe9fca (patch)
tree2154cd518a51023f90652108a0275b016aca1a03 /xmake/scripts/base/makefile.lua
parentb29768c25b1eb62b397de5d287e39ed6991c2fd7 (diff)
add cfuncs for target and fix parse argv bug
Diffstat (limited to 'xmake/scripts/base/makefile.lua')
-rw-r--r--xmake/scripts/base/makefile.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index 7b1ca2e7d..26b45d856 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -74,7 +74,7 @@ function makefile._make_object(file, target, srcfile, objfile)
-- make body
file:write(string.format("\t@echo %scompiling%s %s\n", utils.ifelse(ccache, "ccache ", ""), mode, srcfile))
- file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("[%s=\"]", function (w) return string.format("%%%x", w:byte()) end)))
+ file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("[=\"]", function (w) return string.format("%%%x", w:byte()) end)))
file:write(string.format("\t@xmake l mkdir %s\n", path.directory(objfile)))
file:write(string.format("\t@%s\n", cmd))
@@ -180,7 +180,7 @@ function makefile._make_target(file, name, target)
local cmd = linker.make(l, target, objfiles, targetfile, makefile._LOGFILE)
-- the verbose
- local verbose = cmd:gsub("[%s=\"<]", function (w) return string.format("%%%x", w:byte()) end)
+ local verbose = cmd:gsub("[=\"<]", function (w) return string.format("%%%x", w:byte()) end)
-- too long?
if verbose and #verbose > 256 then
verbose = verbose:sub(1, 256) .. " ..."