X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=d8f4fbc873fcd0882641ccbdccc30767a3047d0e;hb=0b9530245a33b8206ca38b9de6dfb01e056fd8dc;hp=d42bf8cfbe94ed40c1b32118a9d4018a066f84df;hpb=45d278c6376b55399671e4e87fd59e75f33c354b;p=ghc-hetmet.git

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index d42bf8c..d8f4fbc 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -4,9 +4,7 @@ import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
 import Distribution.Verbosity
-import System.Cmd
 import System.Environment
 
 main :: IO ()
@@ -28,51 +26,41 @@ main = do args <- getArgs
 doit :: FilePath -> FilePath -> Verbosity -> IO ()
 doit pref ghcpkg verbosity =
        do let userHooks = simpleUserHooks
-              copyFlags = CopyFlags {
-                              copyDest = NoCopyDest,
+              copyFlags = (emptyCopyFlags NoCopyDest) {
                               copyVerbose = verbosity
                           }
-              registerFlags = RegisterFlags {
+              registerFlags = emptyRegisterFlags {
                                   regUser = MaybeUserGlobal,
+                                  regVerbose = verbosity,
                                   regGenScript = False,
                                   regInPlace = False,
-                                  regWithHcPkg = Just ghcpkg,
-                                  regVerbose = verbosity
+                                  regWithHcPkg = Just ghcpkg
                               }
-          pdFile <- defaultPackageDesc verbosity
-          pd <- readPackageDescription verbosity pdFile
           lbi <- getPersistBuildConfig
-          let -- XXX These are almighty hacks, shadowing the base
-              -- Setup.hs hacks
-              extraExtraLibs = if pkgName (package pd) == "base"
-                               then ["wsock32", "msvcrt", "kernel32",
-                                     "user32", "shell32"]
-                               else []
-              lib' = case library pd of
-                         Just lib ->
-                             let ems = filter (("GHC.Prim" /=))
-                                     $ exposedModules lib
-                                 lib_bi = libBuildInfo lib
-                                 lib_bi' = lib_bi {
-                                               extraLibs = extraExtraLibs
-                                                       ++ extraLibs lib_bi
-                                           }
-                             in lib {
-                                    exposedModules = ems,
-                                    libBuildInfo = lib_bi'
-                                 }
-                         Nothing ->
-                             error "Expected a library, but none found"
-              pd' = pd { library = Just lib' }
+          let pd = localPkgDescr lbi
+              -- XXX This is an almighty hack, shadowing the base
+              -- Setup.hs hack
+              mkLib filt = case library pd of
+                           Just lib ->
+                               let ems = filter filt $ exposedModules lib
+                               in lib {
+                                      exposedModules = ems
+                                   }
+                           Nothing ->
+                               error "Expected a library, but none found"
+              -- There's no files for GHC.Prim, so we will fail if we
+              -- try to copy them
+              pd_copy = pd { library = Just (mkLib ("GHC.Prim" /=)) }
+              pd_reg  = pd { library = Just (mkLib (const True)) }
               -- When coying, we need to actually give a concrete
               -- directory to copy to rather than "$topdir"
-              lbi_copy = lbi { prefix = pref }
+              lbi_copy = lbi { installDirTemplates = (installDirTemplates lbi) { prefixDirTemplate = toPathTemplate pref } }
               -- When we run GHC we give it a $topdir that includes the
               -- $compiler/lib/ part of libsubdir, so we only want the
               -- $pkgid part in the package.conf file. This is a bit of
               -- a hack, really.
-              lbi_register = lbi { libsubdir = "$pkgid" }
-          (copyHook simpleUserHooks) pd' lbi_copy userHooks copyFlags
-          (regHook simpleUserHooks) pd' lbi_register userHooks registerFlags
+              lbi_reg = lbi { installDirTemplates = (installDirTemplates lbi) { libSubdirTemplate = toPathTemplate "$pkgid" } }
+          (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
+          (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
           return ()