From 383d0fb5145fdb35909ba5931e7e6be786b6e985 Mon Sep 17 00:00:00 2001
From: Shohei Murayama <shohei.murayama@gmail.com>
Date: Fri, 28 Aug 2015 12:48:11 +0900
Subject: Fix argument order

---
 Distribution/Helper.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Distribution')

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),
-- 
cgit v1.2.3