1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
From: Mike Furr <mfurr@debian.org>
Date: Wed, 1 Apr 2009 23:50:52 +0200
Subject: stdin <-> stdout fix (upstream r12115)
---
src/build/omake_rule.ml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/build/omake_rule.ml b/src/build/omake_rule.ml
index 52fbf72..6792334 100644
--- a/src/build/omake_rule.ml
+++ b/src/build/omake_rule.ml
@@ -1040,12 +1040,12 @@ and eval_include_rule venv pos loc sources deps values commands =
* Evaluate the commands NOW.
*)
and exec_commands venv pos loc commands =
- let stdin = channel_of_var venv pos loc stdin_var in
let stdout = channel_of_var venv pos loc stdout_var in
- let stdin = Lm_channel.descr stdin in
+ let stderr = channel_of_var venv pos loc stderr_var in
let stdout = Lm_channel.descr stdout in
+ let stderr = Lm_channel.descr stderr in
List.iter (fun command ->
- let pid = eval_shell_internal stdin stdout command in
+ let pid = eval_shell_internal stdout stderr command in
let status, _ = eval_shell_wait venv pos pid in
let code =
match status with
--
|