aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShohei Murayama <shohei.murayama@gmail.com>2015-08-28 12:48:11 +0900
committerShohei Murayama <shohei.murayama@gmail.com>2015-08-28 12:48:11 +0900
commit383d0fb5145fdb35909ba5931e7e6be786b6e985 (patch)
treed9f610450cf21639405642c8ff1c7ddacf2f1b30
parent2e4007139ae000641f4f23f6e6502be5411ef479 (diff)
Fix argument order
-rw-r--r--Distribution/Helper.hs6
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),