[commit: Cabal] master: Actually use the saved install flags when installing (d12d275)

[Ian Lynagh]

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

On branch  : master

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

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

commit d12d2757c393d5026a6cacc2602ad895a1bd2510
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri Aug 22 16:57:50 2008 +0000

    Actually use the saved install flags when installing

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

 cabal-install/Main.hs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 7672e00..ce9a0e5 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -177,10 +177,11 @@ installAction (cflags,iflags) extraArgs globalFlags = do
   config <- loadConfig verbosity (globalConfigFile globalFlags)
                                  (configUserInstall cflags)
   let cflags' = savedConfigureFlags config `mappend` cflags
+      iflags' = savedInstallFlags   config `mappend` iflags
   (comp, conf) <- configCompilerAux cflags'
   install verbosity
           (configPackageDB' cflags') (globalRepos (savedGlobalFlags config))
-          comp conf cflags' iflags
+          comp conf cflags' iflags'
           [ UnresolvedDependency pkg (configConfigurationsFlags cflags')
           | pkg <- pkgs ]
 
@@ -213,10 +214,11 @@ upgradeAction (cflags,iflags) extraArgs globalFlags = do
   config <- loadConfig verbosity (globalConfigFile globalFlags)
                                  (configUserInstall cflags)
   let cflags' = savedConfigureFlags config `mappend` cflags
+      iflags' = savedInstallFlags   config `mappend` iflags
   (comp, conf) <- configCompilerAux cflags'
   upgrade verbosity
           (configPackageDB' cflags') (globalRepos (savedGlobalFlags config))
-          comp conf cflags' iflags
+          comp conf cflags' iflags'
           [ UnresolvedDependency pkg (configConfigurationsFlags cflags')
           | pkg <- pkgs ]