diff options
| author | ruki <[email protected]> | 2015-06-04 13:50:59 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-04 13:50:59 +0800 |
| commit | 2f468e35a6c681a22308d1c6d1d37764c386c00c (patch) | |
| tree | fe1da0da8db6d61120ec176577aec8df41081f78 /xmake/scripts/base/makefile.lua | |
| parent | 9f1d3468c22adabab1ad06cdb0014c4f6ef2caa6 (diff) | |
add make to tools
Diffstat (limited to 'xmake/scripts/base/makefile.lua')
| -rw-r--r-- | xmake/scripts/base/makefile.lua | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua index 3c18cfb87..aa598c916 100644 --- a/xmake/scripts/base/makefile.lua +++ b/xmake/scripts/base/makefile.lua @@ -31,6 +31,7 @@ local path = require("base/path") local utils = require("base/utils") local config = require("base/config") local project = require("base/project") +local tools = require("tools/tools") local platform = require("platform/platform") -- make the object to the makefile @@ -245,8 +246,15 @@ function makefile.build(target) local buildir = config.get("buildir") assert(buildir) - -- done build - return platform.build(buildir .. "/makefile", target) + -- load make + local make = tools.load(platform.tool("make")) + if not make then + utils.error("not found the make command!") + return false + end + + -- done make + return make.main(buildir .. "/makefile", target) end -- return module: makefile |
