summaryrefslogtreecommitdiff
path: root/xmake/core/tool/compiler.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2016-04-19 10:15:50 +0800
committerruki <[email protected]>2016-04-19 10:15:50 +0800
commit223c87f37fb9e8f3ffe808fae5041a1c4aee95d0 (patch)
tree2aad82da78da4444094a83ad5705f5cdeef28cd4 /xmake/core/tool/compiler.lua
parent9495e08a20c2aeda6b54a4b06b17057056c79ec9 (diff)
reimpl check tool
Diffstat (limited to 'xmake/core/tool/compiler.lua')
-rw-r--r--xmake/core/tool/compiler.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/core/tool/compiler.lua b/xmake/core/tool/compiler.lua
index a5f7eafdf..701983411 100644
--- a/xmake/core/tool/compiler.lua
+++ b/xmake/core/tool/compiler.lua
@@ -402,7 +402,7 @@ end
function compiler:command(target, srcfile, objfile, logfile)
-- get it
- return self:_tool().command(srcfile, objfile, self:_flags(target), logfile)
+ return self:_tool().compcmd(srcfile, objfile, self:_flags(target), logfile)
end
-- make the define flag
@@ -444,16 +444,16 @@ function compiler:check(flags)
end
-- check it
- local ok, results = sandbox.load(ctool.check, flags)
- if not ok then
- os.raise(results)
- end
+ local ok, errors = sandbox.load(ctool.check, flags)
-- trace
- utils.printf("checking for the flags %s ... %s", flags, utils.ifelse(results, "ok", "no"))
+ utils.printf("checking for the flags %s ... %s", flags, utils.ifelse(ok, "ok", "no"))
+ if not ok then
+ utils.verbose(errors)
+ end
-- save the checked result
- self._CHECKED[flags] = results
+ self._CHECKED[flags] = ok
-- ok?
return ok