summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-04 15:46:25 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-04 15:46:25 -0400
commitb411eb441024d5f4afa360ea3ff53c9a502a86a0 (patch)
tree07a598642db1deff9779d80f05b6951205ce1a2a /Build
parent11d7cdc840c5e30310198eb3a5c3ff39a30e2907 (diff)
parentda451ad509268133fff9b2f58caebae2204b318e (diff)
Merge branch 'winprocfix'
Diffstat (limited to 'Build')
-rw-r--r--Build/EvilLinker.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index fa260edab..97f218fd5 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -21,6 +21,7 @@ import Data.List
import Utility.Monad
import Utility.Process hiding (env)
+import qualified Utility.Process
import Utility.Env
data CmdParams = CmdParams
@@ -126,7 +127,7 @@ getOutput c ps environ = do
putStrLn $ unwords [c, show ps]
systemenviron <- getEnvironment
let environ' = fromMaybe [] environ ++ systemenviron
- out@(_, ok) <- processTranscript' c ps (Just environ') Nothing
+ out@(_, ok) <- processTranscript' (\p -> p { Utility.Process.env = Just environ' }) c ps Nothing
putStrLn $ unwords [c, "finished", show ok]
return out