[commit: ghc] master: Update process submodule (8b7534b)

git at git.haskell.org git at git.haskell.org
Mon Mar 9 13:17:27 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8b7534b39052c9cb44411bea0ca311a751564d6c/ghc

>---------------------------------------------------------------

commit 8b7534b39052c9cb44411bea0ca311a751564d6c
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Mar 8 15:39:16 2015 +0100

    Update process submodule
    
    Summary:
    Rename `SysTools.readCreateProcess`.
    
    Functions `readCreateProcess` and `readCreateProcessWithExitCode` were added
    to `System.Process`, the former of which conflicts with
    `SysTools.readCreateProcess`.
    
    Reviewed by: austin
    
    Differential Revision: https://phabricator.haskell.org/D713


>---------------------------------------------------------------

8b7534b39052c9cb44411bea0ca311a751564d6c
 compiler/main/SysTools.hs | 9 +++++----
 libraries/process         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 56eba69..aba4a1b 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -469,13 +469,14 @@ askCc dflags args = do
       args2 = args0 ++ args1 ++ args
   mb_env <- getGccEnv args2
   runSomethingWith dflags "gcc" p args2 $ \real_args ->
-    readCreateProcess (proc p real_args){ env = mb_env }
+    readCreateProcessWithExitCode' (proc p real_args){ env = mb_env }
 
--- Version of System.Process.readProcessWithExitCode that takes an environment
-readCreateProcess
+-- Similar to System.Process.readCreateProcessWithExitCode, but stderr is
+-- inherited from the parent process, and output to stderr is not captured.
+readCreateProcessWithExitCode'
     :: CreateProcess
     -> IO (ExitCode, String)    -- ^ stdout
-readCreateProcess proc = do
+readCreateProcessWithExitCode' proc = do
     (_, Just outh, _, pid) <-
         createProcess proc{ std_out = CreatePipe }
 
diff --git a/libraries/process b/libraries/process
index 160bdd1..ae10a33 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 160bdd16722d85c2644bd2353121d8eb5e1597e4
+Subproject commit ae10a33cd16d9ac9238a193e5355c5c2e05ef0a2



More information about the ghc-commits mailing list