[commit: Cabal] master: Fix setupWrapper bug, when no compiler was configured (f4fce20)

[Ian Lynagh]

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

On branch  : master

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

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

commit f4fce201c690c447eec5e42c7859da95e4e37d98
Author: Duncan Coutts <duncan at haskell.org>
Date:   Wed Apr 30 11:44:48 2008 +0000

    Fix setupWrapper bug, when no compiler was configured

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

 cabal-install/Hackage/SetupWrapper.hs |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cabal-install/Hackage/SetupWrapper.hs b/cabal-install/Hackage/SetupWrapper.hs
index 19fe1bd..8cfdcdd 100644
--- a/cabal-install/Hackage/SetupWrapper.hs
+++ b/cabal-install/Hackage/SetupWrapper.hs
@@ -178,9 +178,13 @@ compileSetupExecutable :: Verbosity -> SetupScriptOptions -> FilePath -> IO ()
 compileSetupExecutable verbosity options setupHs = do
   outOfDate <- setupHs `moreRecentFile` setupProg
   when outOfDate $ do
-    cabalPkgId <- installedCabalLibVer verbosity options
+    (comp, conf) <- case useCompiler options of
+      Just comp -> return (comp, useProgramConfig options)
+      Nothing -> configCompiler (Just GHC) Nothing Nothing
+                   (useProgramConfig options) verbosity
+    cabalPkgId <- installedCabalLibVer verbosity options comp conf
     createDirectoryIfMissingVerbose verbosity True setupDir
-    rawSystemProgramConf verbosity ghcProgram (useProgramConfig options) $
+    rawSystemProgramConf verbosity ghcProgram conf $
         ghcVerbosityOptions verbosity
      ++ ["--make", setupHs, "-o", setupProg
         ,"-package", display cabalPkgId
@@ -190,18 +194,15 @@ compileSetupExecutable verbosity options setupHs = do
     setupDir  = distPref </> "setup"
     setupProg = setupDir </> "setup" <.> exeExtension
 
-installedCabalLibVer :: Verbosity -> SetupScriptOptions -> IO PackageIdentifier
-installedCabalLibVer verbosity options = do
+installedCabalLibVer :: Verbosity -> SetupScriptOptions
+                     -> Compiler -> ProgramConfiguration
+                     -> IO PackageIdentifier
+installedCabalLibVer verbosity options comp conf = do
   index <- case usePackageIndex options of
     Just index -> return index
-    Nothing    -> do
-      (comp, conf) <- case useCompiler options of
-        Just comp -> return (comp, useProgramConfig options)
-        Nothing -> configCompiler (Just GHC) Nothing Nothing
-                     (useProgramConfig options) verbosity
-      fromMaybe mempty `fmap`
-        getInstalledPackages verbosity comp UserPackageDB conf
-        -- user packages are *allowed* here, no portability problem
+    Nothing    -> fromMaybe mempty
+           `fmap` getInstalledPackages verbosity comp UserPackageDB conf
+                  -- user packages are *allowed* here, no portability problem
 
   let cabalDep = Dependency "Cabal" (useCabalVersion options)
   case PackageIndex.lookupDependency index cabalDep of