[commit: Cabal] master: Pass on the compiler to use when building a package (b4197d7)

[Ian Lynagh]

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

On branch  : master

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

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

commit b4197d743e273441c283f00bb91339abe16e5909
Author: Duncan Coutts <duncan at haskell.org>
Date:   Wed Oct 17 22:55:07 2007 +0000

    Pass on the compiler to use when building a package

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

 cabal-install/Hackage/Install.hs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs
index 342aadd..a234fc6 100644
--- a/cabal-install/Hackage/Install.hs
+++ b/cabal-install/Hackage/Install.hs
@@ -75,11 +75,13 @@ installRepoPackages cfg comp conf globalArgs deps =
 mkPkgOps :: ConfigFlags -> Compiler -> PackageIdentifier -> String -> [String] -> [String]
 mkPkgOps cfg comp pkgId cmd ops = verbosity ++
   case cmd of
-    "configure" -> user ++ installDirFlags installDirs ++ ops
+    "configure" -> user ++ hcPath ++ hcPkgPath ++ installDirFlags installDirs ++ ops
     "install"   -> user
     _ -> []
  where verbosity = ["-v" ++ showForCabal (configVerbose cfg)]
        user = if configUserInstall cfg then ["--user"] else []
+       hcPath    = maybe [] (\path -> ["--with-compiler=" ++ path]) (configCompilerPath cfg)
+       hcPkgPath = maybe [] (\path -> ["--with-hc-pkg="   ++ path]) (configHcPkgPath    cfg)
        installDirTemplates | configUserInstall cfg = configUserInstallDirs cfg
                            | otherwise             = configGlobalInstallDirs cfg
        installDirs = absoluteInstallDirs pkgId (compilerId comp) NoCopyDest installDirTemplates