[commit: Cabal] master: Pass dist dir and verbosity flags to build and install phases (a80dead)

Ian Lynagh igloo at earth.li
Fri Jun 24 01:56:51 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a80deadf3aa411876a9818de9df61df15562c74d

>---------------------------------------------------------------

commit a80deadf3aa411876a9818de9df61df15562c74d
Author: Duncan Coutts <duncan at haskell.org>
Date:   Sat Aug 2 01:42:26 2008 +0000

    Pass dist dir and verbosity flags to build and install phases

>---------------------------------------------------------------

 cabal-install/Distribution/Client/Install.hs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 58a4a89..cf0101a 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -337,15 +337,22 @@ installUnpackedPackage verbosity scriptOptions miscOptions configFlags
     = onFailure ConfigureFailed $ do
         setup configureCommand (filterConfigureFlags configFlags)
         onFailure BuildFailed $ do
-          setup buildCommand (const Cabal.emptyBuildFlags)
+          setup buildCommand buildFlags
           onFailure InstallFailed $ do
             case rootCmd miscOptions of
               (Just cmd) -> reexec cmd
-              Nothing    -> setup Cabal.installCommand
-                                  (const Cabal.emptyInstallFlags)
+              Nothing    -> setup Cabal.installCommand installFlags
             return BuildOk
   where
     buildCommand     = Cabal.buildCommand defaultProgramConfiguration
+    buildFlags   _   = Cabal.emptyBuildFlags {
+      Cabal.buildDistPref  = Cabal.configDistPref configFlags,
+      Cabal.buildVerbosity = Cabal.toFlag verbosity
+    }
+    installFlags _   = Cabal.emptyInstallFlags {
+      Cabal.installDistPref  = Cabal.configDistPref configFlags,
+      Cabal.installVerbosity = Cabal.toFlag verbosity
+    }
     setup cmd flags  = do
       logFileHandle <- case useLogFile of
         Nothing          -> return Nothing





More information about the Cvs-libraries mailing list