diff options
| -rw-r--r-- | xmake/modules/core/project/depend.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/build/target.lua | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/xmake/modules/core/project/depend.lua b/xmake/modules/core/project/depend.lua index ca05dc2f4..15b5d25c8 100644 --- a/xmake/modules/core/project/depend.lua +++ b/xmake/modules/core/project/depend.lua @@ -70,7 +70,7 @@ end -- show diagnosis info? function _is_show_diagnosis_info() - local show = _g.is_show_diagnosis_info + local show = true -- _g.is_show_diagnosis_info if show == nil then if project.policy("diagnosis.check_build_deps") then show = true diff --git a/xmake/modules/private/action/build/target.lua b/xmake/modules/private/action/build/target.lua index 0116dcd6f..8497baa43 100644 --- a/xmake/modules/private/action/build/target.lua +++ b/xmake/modules/private/action/build/target.lua @@ -778,6 +778,10 @@ end function run_targetjobs(targets_root, opt) opt = opt or {} local job_kind = opt.job_kind + local comax = option.get("jobs") or os.default_njob() + if job_kind == "config" then + --comax = option.get("jobs") or 1 + end local jobgraph = get_targetjobs(targets_root, opt) if jobgraph and not jobgraph:empty() then local curdir = os.curdir() @@ -786,7 +790,7 @@ function run_targetjobs(targets_root, opt) if errors and progress.showing_without_scroll() then print("") end - end, comax = option.get("jobs") or 1, curdir = curdir, distcc = opt.distcc, progress_factor = opt.progress_factor}) + end, comax = comax, curdir = curdir, distcc = opt.distcc, progress_factor = opt.progress_factor}) os.cd(curdir) return true end @@ -804,7 +808,7 @@ function run_filejobs(targets_root, opt) if errors and progress.showing_without_scroll() then print("") end - end, comax = option.get("jobs") or 1, curdir = curdir, distcc = opt.distcc, progress_factor = opt.progress_factor}) + end, comax = option.get("jobs") or os.default_njob(), curdir = curdir, distcc = opt.distcc, progress_factor = opt.progress_factor}) os.cd(curdir) return true end |