Fix some bad settings in external processes

krisis · Jan 2, 2018 · 52c00c6 · 52c00c6
1 parent a9042ad
commit 52c00c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -1085,7 +1085,14 @@ installGHCPosix version downloadInfo _ archiveFile archiveType tempDir destDir =
 
     let runStep step wd env cmd args = do
             menv' <- modifyEnvOverride menv (Map.union env)
-            result <- withWorkingDir wd $ withEnvOverride menv' $ try $ readProcessNull cmd args
+            result <- withWorkingDir wd
+                    $ withEnvOverride menv'
+                    $ withProc cmd args
+                    $ try
+                    . readProcessStdout_
+                    -- Calling the ./configure script requires that stdin is
+                    -- open
+                    . setStdin (useHandleOpen stdin)
             case result of
                 Right _ -> return ()
                 Left ex -> do

diff --git a/subs/rio/src/RIO/Process.hs b/subs/rio/src/RIO/Process.hs
@@ -190,7 +190,6 @@ withProc name0 args inner = do
 
   withProcessTimeLog (toFilePath <$> eoWorkingDir menv) name args
     $ inner
-    $ setDelegateCtlc True
     $ setEnv (envHelper menv)
     $ maybe id (setWorkingDir . toFilePath) (eoWorkingDir menv)