summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/actions/build/build.lua7
-rw-r--r--xmake/actions/build/target_utils.lua2
2 files changed, 5 insertions, 4 deletions
diff --git a/xmake/actions/build/build.lua b/xmake/actions/build/build.lua
index 63121ea07..824e8c5c5 100644
--- a/xmake/actions/build/build.lua
+++ b/xmake/actions/build/build.lua
@@ -31,12 +31,13 @@ function _prepare(targets_root, opt)
target_utils.runjobs(targets_root, opt)
end
--- TODO distcc
function _build(targets_root, opt)
- --[[
opt = opt or {}
opt.job_kind = "build"
- target_utils.runjobs(targets_root, opt)]]
+ if distcc_build_client.is_connected() then
+ opt.distcc = distcc_build_client.singleton()
+ end
+ target_utils.runjobs(targets_root, opt)
end
function main(targetnames, opt)
diff --git a/xmake/actions/build/target_utils.lua b/xmake/actions/build/target_utils.lua
index b6f9617c8..d411ed53e 100644
--- a/xmake/actions/build/target_utils.lua
+++ b/xmake/actions/build/target_utils.lua
@@ -284,7 +284,7 @@ function runjobs(targets_root, opt)
if errors and progress.showing_without_scroll() then
print("")
end
- end, comax = option.get("jobs") or 1, curdir = curdir})
+ end, comax = option.get("jobs") or 1, curdir = curdir, distcc = opt.distcc})
os.cd(curdir)
end
end