improve njob

6 files changed, 7 insertions, 7 deletions

diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 209e6c68a..9e4f8c4b4 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -299,7 +299,7 @@ function install(package, configs, opt)
 
     -- do make and install
     opt = opt or {}
-    local njob = opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
     local argv = {"-j" .. njob}
     if option.get("verbose") then
         table.insert(argv, "V=1")
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 73af75b32..857f859be 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -30,7 +30,7 @@ import("package.tools.ninja")
 
 -- get the number of parallel jobs
 function _get_parallel_njobs(opt)
-    return opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    return opt.jobs or option.get("jobs") or tostring(os.default_njob())
 end
 
 -- translate paths
diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua
index ff6dce8ed..a40cd57c1 100644
--- a/xmake/modules/package/tools/make.lua
+++ b/xmake/modules/package/tools/make.lua
@@ -91,7 +91,7 @@ function build(package, configs, opt)
     opt = opt or {}
 
     -- pass configurations
-    local njob = opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
     local argv = {"-j" .. njob}
     if option.get("verbose") then
         table.insert(argv, "VERBOSE=1")
diff --git a/xmake/modules/package/tools/ninja.lua b/xmake/modules/package/tools/ninja.lua
index e1feccc14..e16731670 100644
--- a/xmake/modules/package/tools/ninja.lua
+++ b/xmake/modules/package/tools/ninja.lua
@@ -26,7 +26,7 @@ import("lib.detect.find_tool")
 function build(package, configs, opt)
     opt = opt or {}
     local buildir = opt.buildir or os.curdir()
-    local njob = opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
     local ninja = assert(find_tool("ninja"), "ninja not found!")
     local argv = {"-C", buildir}
     if option.get("verbose") then
@@ -44,7 +44,7 @@ end
 function install(package, configs, opt)
     opt = opt or {}
     local buildir = opt.buildir or os.curdir()
-    local njob = tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    local njob = tostring(os.default_njob())
     local ninja = assert(find_tool("ninja"), "ninja not found!")
     local argv = {"install", "-C", buildir}
     if option.get("verbose") then
diff --git a/xmake/modules/package/tools/scons.lua b/xmake/modules/package/tools/scons.lua
index 386645bba..0c197933f 100644
--- a/xmake/modules/package/tools/scons.lua
+++ b/xmake/modules/package/tools/scons.lua
@@ -86,7 +86,7 @@ end
 function build(package, configs, opt)
     opt = opt or {}
     local buildir = opt.buildir or os.curdir()
-    local njob = opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2))
+    local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
     local scons = assert(find_tool("scons"), "scons not found!")
     local argv = {"-C", buildir, "-j", njob}
     configs = _get_configs(package, configs)
diff --git a/xmake/modules/private/xrepo/action/install.lua b/xmake/modules/private/xrepo/action/install.lua
index ccd14c839..f6f111185 100644
--- a/xmake/modules/private/xrepo/action/install.lua
+++ b/xmake/modules/private/xrepo/action/install.lua
@@ -40,7 +40,7 @@ function menu_options()
                                        "e.g.",
                                        "    - xrepo install -f \"vs_runtime=MD\" zlib",
                                        "    - xrepo install -f \"regex=true,thread=true\" boost"},
-        {'j', "jobs",       "kv", tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2)),
+        {'j', "jobs",       "kv", tostring(os.default_njob()),
                                           "Set the number of parallel compilation jobs."},
         {nil, "linkjobs",   "kv", nil,    "Set the number of parallel link jobs."},
         {nil, "includes",      "kv", nil, "Includes extra lua configuration files.",