diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2015-08-28 07:35:38 +0200 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2015-08-28 07:35:38 +0200 |
| commit | ee950d4b1df668ff5c4b61649e5ae3c18a54aa40 (patch) | |
| tree | cfd8a45d67de2a930e755b927a3b327b4192b0fa /Distribution | |
| parent | c077880ea13970f37ceb82d34cf6e1ddb4c1f12a (diff) | |
| parent | 383d0fb5145fdb35909ba5931e7e6be786b6e985 (diff) | |
Merge remote-tracking branch 'yuga/fix-arg-order'
Diffstat (limited to 'Distribution')
| -rw-r--r-- | Distribution/Helper.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs index 648842a..38616a7 100644 --- a/Distribution/Helper.hs +++ b/Distribution/Helper.hs @@ -247,14 +247,14 @@ getSomeConfigState = ask >>= \(QueryEnv readProc progs projdir distdir) -> do , "ghc-merged-pkg-options" , "ghc-lang-options" , "licenses" - ] ++ progArgs + ] res <- liftIO $ do exe <- findLibexecExe "cabal-helper-wrapper" - out <- readProc exe (projdir:distdir:args) "" + out <- readProc exe (progArgs ++ projdir:distdir:args) "" evaluate (read out) `E.catch` \(SomeException _) -> error $ concat ["getSomeConfigState", ": ", exe, " " - , intercalate " " (map show $ distdir:args) + , intercalate " " (map show $ progArgs ++ projdir:distdir:args) , " (read failed)"] let [ Just (ChResponsePkgDbs pkgDbs), |