merge from gcc

[deliverable/binutils-gdb.git] / libiberty / pex-common.c

diff --git a/libiberty/pex-common.c b/libiberty/pex-common.c
index 3daa638d402b4521a2d416f4a5ea76a85cc1c9ef..bb127f2ed77f7853e7a791e86191e9780135beae 100644 (file)
--- a/libiberty/pex-common.c
+++ b/libiberty/pex-common.c
@@ -157,6 +157,7 @@ pex_run_in_environment (struct pex_obj *obj, int flags, const char *executable,
   char *outname;
   int outname_allocated;
   int p[2];
+  int toclose;
   long pid;
 
   in = -1;
@@ -297,10 +298,18 @@ pex_run_in_environment (struct pex_obj *obj, int flags, const char *executable,
        }
     }
 
+  /* If we are using pipes, the child process has to close the next
+     input pipe.  */
+
+  if ((obj->flags & PEX_USE_PIPES) == 0)
+    toclose = -1;
+  else
+    toclose = obj->next_input;
+
   /* Run the program.  */
 
   pid = obj->funcs->exec_child (obj, flags, executable, argv, env,
-                                in, out, errdes, &errmsg, err);
+                               in, out, errdes, toclose, &errmsg, err);
   if (pid < 0)
     goto error_exit;