summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-03-08 15:39:16 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2015-03-09 14:14:53 +0100
commit8b7534b39052c9cb44411bea0ca311a751564d6c (patch)
tree646173b2c3a67387172722065b902f5383017600
parente76f86646229b3f8bcdc6ad71d464104c639f431 (diff)
downloadhaskell-8b7534b39052c9cb44411bea0ca311a751564d6c.tar.gz
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
-rw-r--r--compiler/main/SysTools.hs9
m---------libraries/process0
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 56eba69333..aba4a1b06b 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
-Subproject 160bdd16722d85c2644bd2353121d8eb5e1597e
+Subproject ae10a33cd16d9ac9238a193e5355c5c2e05ef0a