summaryrefslogtreecommitdiff
path: root/xmake/scripts/base
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-12 12:45:43 +0800
committerruki <[email protected]>2015-06-12 12:45:43 +0800
commit1b9fc52acd62fea9dfa017481b146cf59993b1df (patch)
treecd3d531fc73051415e32877eca2f49d0b7c3e9fb /xmake/scripts/base
parent99b9eb72c8db9854311fc0b5a79e07f8cae85242 (diff)
update platform for linux
Diffstat (limited to 'xmake/scripts/base')
-rw-r--r--xmake/scripts/base/compiler.lua4
-rw-r--r--xmake/scripts/base/makefile.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua
index f0c71053f..bbf9a6106 100644
--- a/xmake/scripts/base/compiler.lua
+++ b/xmake/scripts/base/compiler.lua
@@ -371,13 +371,13 @@ function compiler.get(srcfile)
-- invalid compiler
if not module.command_compile then
- return nil, string.format("invalid compiler: %s", path.filename(platform.tool(kind)))
+ return nil, string.format("invalid compiler for %s", kind)
end
-- save kind
module._KIND = kind
else
- return nil, string.format("unknown compiler: %s", path.filename(platform.tool(kind)))
+ return nil, string.format("unknown compiler for %s", kind)
end
-- ok?
diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index 8be6334a5..4a91c0b3d 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -125,7 +125,7 @@ function makefile._make_target(file, name, target)
-- get the linker from the given kind
local l = linker.get(target.kind)
- assert(l)
+ if not l then return false end
-- make head
file:write(string.format("%s:", name))