summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-03-25 15:44:04 +0800
committerruki <[email protected]>2016-03-25 15:44:04 +0800
commit2d269f2eb8a61c7b4225a766ceedec4fd1858e95 (patch)
treefef5b7729b4797fbeecbdbd0bd20728a48ff928b
parentf5bf28c7da5c0f5987fc06a0c67f8773535aa7ed (diff)
add jobjs for building
-rw-r--r--xmake/core/platform/tools/make.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/xmake/core/platform/tools/make.lua b/xmake/core/platform/tools/make.lua
index c4ca73de8..dc9681277 100644
--- a/xmake/core/platform/tools/make.lua
+++ b/xmake/core/platform/tools/make.lua
@@ -40,16 +40,17 @@ function make.init(self, name)
end
-- the main function
-function make.main(self, makefile, target)
+function make.main(self, makefile, target, jobs)
-- enable jobs?
- local jobs = ""
- if option.get("jobs") ~= nil then
- if tonumber(option.get("jobs")) ~= 0 then
- jobs = "-j" .. option.get("jobs")
+ if jobs ~= nil then
+ if tonumber(jobs) ~= 0 then
+ jobs = "-j" .. jobs
else
jobs = "-j"
end
+ else
+ jobs = ""
end
-- make command