Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8b18305d0d790509f4b11f48b7c05c7404b73b05 >--------------------------------------------------------------- commit 8b18305d0d790509f4b11f48b7c05c7404b73b05 Author: Andres Loeh <[email protected]> Date: Fri Oct 28 11:23:58 2011 +0000 proper fix for default solver option handling Suggested by Duncan. >--------------------------------------------------------------- cabal-install/Main.hs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index d2e5499..bba1567 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -16,7 +16,7 @@ module Main (main) where import Distribution.Client.Setup ( GlobalFlags(..), globalCommand, globalRepos , ConfigFlags(..) - , ConfigExFlags(..), configureExCommand + , ConfigExFlags(..), defaultConfigExFlags, configureExCommand , InstallFlags(..), defaultInstallFlags , installCommand, upgradeCommand , FetchFlags(..), fetchCommand @@ -202,7 +202,8 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags) config <- loadConfig verbosity (globalConfigFile globalFlags) (configUserInstall configFlags) let configFlags' = savedConfigureFlags config `mappend` configFlags - configExFlags' = savedConfigureExFlags config `mappend` configExFlags + configExFlags' = defaultConfigExFlags `mappend` + savedConfigureExFlags config `mappend` configExFlags installFlags' = defaultInstallFlags `mappend` savedInstallFlags config `mappend` installFlags globalFlags' = savedGlobalFlags config `mappend` globalFlags _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
