summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-09-03 00:49:06 +0800
committerruki <[email protected]>2020-09-03 00:49:06 +0800
commitf4201580b8fe687c3ec5fdae0960812e7b9a9706 (patch)
tree3dda1f1315b5a1ba40d60ec9fccb079385108fd4
parent208daf19e621bcaba400a576505553c9f20f3d89 (diff)
fix build directory
-rw-r--r--xmake/actions/build/build.lua2
-rw-r--r--xmake/modules/private/async/runjobs.lua3
2 files changed, 4 insertions, 1 deletions
diff --git a/xmake/actions/build/build.lua b/xmake/actions/build/build.lua
index 9dbd93a8f..dd40fe0c9 100644
--- a/xmake/actions/build/build.lua
+++ b/xmake/actions/build/build.lua
@@ -223,7 +223,7 @@ function main(targetname)
if errors and progress.showing_without_scroll() then
print("")
end
- end})
+ end, curdir = os.curdir()})
end
end
diff --git a/xmake/modules/private/async/runjobs.lua b/xmake/modules/private/async/runjobs.lua
index d9ecdfa58..bb5fc17ba 100644
--- a/xmake/modules/private/async/runjobs.lua
+++ b/xmake/modules/private/async/runjobs.lua
@@ -182,6 +182,9 @@ function main(name, jobs, opt)
{
function()
if jobfunc then
+ if opt.curdir then
+ os.cd(opt.curdir)
+ end
jobfunc(i, total)
end
end,