Correct the order of args given by --PROG-options

They were getting reversed. Problem located by Igloo.
haskell · Jul 10, 2008 · 597ee5d · 597ee5d
1 parent 31342e9
commit 597ee5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Distribution/Simple.hs b/Distribution/Simple.hs
@@ -254,8 +254,10 @@ buildAction :: UserHooks -> BuildFlags -> Args -> IO ()
 buildAction hooks flags args = do
                 let distPref = fromFlag $ buildDistPref flags
                 lbi <- getBuildConfigIfUpToDate distPref
-                let progs = foldr (uncurry userSpecifyArgs)
+                let progs = foldl userSpecifyArgs'
                                   (withPrograms lbi) (buildProgramArgs flags)
+                      where userSpecifyArgs' conf (prog, args') =
+                              userSpecifyArgs prog args' conf
                 hookedAction preBuild buildHook postBuild
                              (return lbi { withPrograms = progs })
                              hooks flags args

diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
@@ -274,9 +274,11 @@ configure (pkg_descr0, pbi) cfg
         createDirectoryIfMissingVerbose (lessVerbose verbosity) True distPref
 
         let programsConfig =
-                flip (foldr (uncurry userSpecifyArgs)) (configProgramArgs cfg)
-              . flip (foldr (uncurry userSpecifyPath)) (configProgramPaths cfg)
+                flip (foldl userSpecifyArgs') (configProgramArgs cfg)
+              . flip (foldl userSpecifyPath') (configProgramPaths cfg)
               $ configPrograms cfg
+            userSpecifyArgs' conf (prog, args) = userSpecifyArgs prog args conf
+            userSpecifyPath' conf (prog, path) = userSpecifyPath prog path conf
             userInstall = fromFlag (configUserInstall cfg)
             defaultPackageDB | userInstall = UserPackageDB
                              | otherwise   = GlobalPackageDB