summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-09-14 23:31:20 +0800
committerruki <[email protected]>2023-09-14 23:31:20 +0800
commitf4d934f9b806062a0c7c68abb45eb29414045372 (patch)
tree07e86bcaa14b90184ad0491e08ee22a1c33a3a0f
parentcc9c8f16dbad7152d44503df9b2f45d0fa3c3463 (diff)
support to output same pipes
m---------core/src/tbox/tbox0
-rw-r--r--xmake/modules/private/service/remote_build/server_session.lua2
2 files changed, 1 insertions, 1 deletions
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject a7af6211cc19a9c5dce0f2f95299d894bda1a8e
+Subproject e95f652c85796f1d707ce59786cdc061ed99dbb
diff --git a/xmake/modules/private/service/remote_build/server_session.lua b/xmake/modules/private/service/remote_build/server_session.lua
index 7aa2825c0..a9347c0c4 100644
--- a/xmake/modules/private/service/remote_build/server_session.lua
+++ b/xmake/modules/private/service/remote_build/server_session.lua
@@ -259,7 +259,7 @@ function server_session:runcmd(respmsg)
if os.isfile(path.join(self:xmake_sourcedir(), "core", "main.lua")) then
xmakesrc = self:xmake_sourcedir()
end
- os.execv(program, argv, {curdir = self:sourcedir(), stdout = stdout_wpipe, stdin = stdin_rpipe,
+ os.execv(program, argv, {curdir = self:sourcedir(), stdout = stdout_wpipe, stderr = stdout_wpipe, stdin = stdin_rpipe,
envs = {XMAKE_IN_SERVICE = "true", XMAKE_PROGRAM_DIR = xmakesrc}})
stdin_rpipe:close()
stdout_wpipe:close()