@@ -212,14 +212,14 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
212 , display $ ppVersion $ piPlan sbPackageInfo
212 , display $ ppVersion $ piPlan sbPackageInfo
215− runIn wdir outH errH cmd args =
215+ runIn wdir outH cmd args =
216 withCheckedProcess cp $ \ClosedStream UseProvidedHandle UseProvidedHandle ->
216 withCheckedProcess cp $ \ClosedStream UseProvidedHandle UseProvidedHandle ->
217 (return () :: IO ())
217 (return () :: IO ())
219 cp = (proc (unpack $ asText cmd) (map (unpack . asText) args))
219 cp = (proc (unpack $ asText cmd) (map (unpack . asText) args))
220 { cwd = Just $ fpToString wdir
220 { cwd = Just $ fpToString wdir
221 , std_out = UseHandle outH
221 , std_out = UseHandle outH
222− , std_err = UseHandle errH
222+ , std_err = UseHandle outH
223 , env = Just sbModifiedEnv
223 , env = Just sbModifiedEnv
225 runParent = runIn sbBuildDir
225 runParent = runIn sbBuildDir
@@ -238,9 +238,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
240 libOut = pbLogDir </> fpFromText namever </> "build.out"
240 libOut = pbLogDir </> fpFromText namever </> "build.out"
241− libErr = pbLogDir </> fpFromText namever </> "build.err"
242 testOut = pbLogDir </> fpFromText namever </> "test.out"
241 testOut = pbLogDir </> fpFromText namever </> "test.out"
243− testErr = pbLogDir </> fpFromText namever </> "test.err"
244 testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"
242 testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"
246 wf fp inner = do
244 wf fp inner = do
@@ -268,10 +266,10 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
269 PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo
267 PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo
271− buildLibrary = wf libOut $ \outH -> wf libErr $ \errH -> do
269+ buildLibrary = wf libOut $ \outH -> do
272− let run = runChild outH errH
270+ let run = runChild outH
273 log' $ "Unpacking " ++ namever
271 log' $ "Unpacking " ++ namever
274− runParent outH errH "cabal" ["unpack", namever]
272+ runParent outH "cabal" ["unpack", namever]
276 log' $ "Configuring " ++ namever
274 log' $ "Configuring " ++ namever
277 run "cabal" $ "configure" : configArgs
275 run "cabal" $ "configure" : configArgs
@@ -328,8 +326,8 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
328 (Right (), ExpectFailure) -> warn $ namever ++ ": unexpected Haddock success"
326 (Right (), ExpectFailure) -> warn $ namever ++ ": unexpected Haddock success"
329 _ -> return ()
327 _ -> return ()
331− runTests = wf testOut $ \outH -> wf testErr $ \errH -> do
329+ runTests = wf testOut $ \outH -> do
332− let run = runChild outH errH
330+ let run = runChild outH
334 when (pcTests /= Don'tBuild) $ do
332 when (pcTests /= Don'tBuild) $ do
335 log' $ "Test configure " ++ namever
333 log' $ "Test configure " ++ namever