Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/22b23f90cd651956fc3d884d549564ce8fb74988 >--------------------------------------------------------------- commit 22b23f90cd651956fc3d884d549564ce8fb74988 Author: Duncan Coutts <[email protected]> Date: Wed Apr 30 08:49:38 2008 +0000 Make the default SavedConfig contain empty rather than default ConfigFlags We do not want to pass a load of default command line flags. We only want to pass flags where we're overriding the defaults. Also it's because old Cabal versions do not understand new flags. >--------------------------------------------------------------- cabal-install/Hackage/Config.hs | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs index d121d75..43f72c6 100644 --- a/cabal-install/Hackage/Config.hs +++ b/cabal-install/Hackage/Config.hs @@ -39,9 +39,9 @@ import Distribution.Simple.Compiler (PackageDB(..)) import Distribution.Simple.InstallDirs ( InstallDirs(..), PathTemplate, toPathTemplate, fromPathTemplate ) import Distribution.Simple.Command (ShowOrParseArgs(..), viewAsFieldDescr) -import Distribution.Simple.Program (defaultProgramConfiguration) -import Distribution.Simple.Setup ( Flag(..), toFlag, fromFlag, fromFlagOrDefault - , ConfigFlags, defaultConfigFlags, configureOptions) +import Distribution.Simple.Setup + ( Flag(..), toFlag, fromFlag, fromFlagOrDefault + , ConfigFlags, configureOptions ) import qualified Distribution.Simple.Setup as ConfigFlags import qualified Distribution.Simple.Setup as Cabal import Distribution.Verbosity (Verbosity, normal) @@ -129,7 +129,7 @@ defaultSavedConfig = do userInstallDirs <- defaultUserInstallDirs cacheDir <- defaultCacheDir return SavedConfig - { configFlags = (defaultConfigFlags defaultProgramConfiguration){ + { configFlags = mempty { ConfigFlags.configHcFlavor = toFlag defaultCompiler , ConfigFlags.configVerbosity = toFlag normal , ConfigFlags.configUserInstall = toFlag True _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
