When registering base during installation, don't hide GHC.Prim

[ghc-hetmet.git] / libraries / installPackage.hs

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index dcba287..5c83e7a 100644 (file)
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -7,10 +7,13 @@ import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import Distribution.Verbosity
 import System.Environment
+import System.Info
 
 main :: IO ()
 main = do args <- getArgs
-          let verbosity = case args of
+          case args of
+              pref : ghcpkg : args' ->
+                  let verbosity = case args' of
                               [] -> normal
                               ['-':'v':v] ->
                                   let m = case v of
@@ -18,43 +21,61 @@ main = do args <- getArgs
                                               _ -> Just v
                                   in flagToVerbosity m
                               _ -> error ("Bad arguments: " ++ show args)
-              userHooks = simpleUserHooks
-              installFlags = InstallFlags {
-                                 installUserFlags = MaybeUserGlobal,
-                                 installVerbose = verbosity
-                             }
+                  in doit pref ghcpkg verbosity
+              _ ->
+                  error "Missing arguments"
+
+doit :: FilePath -> FilePath -> Verbosity -> IO ()
+doit pref ghcpkg verbosity =
+       do let userHooks = simpleUserHooks
+              copyFlags = CopyFlags {
+                              copyDest = NoCopyDest,
+                              copyVerbose = verbosity
+                          }
+              registerFlags = RegisterFlags {
+                                  regUser = MaybeUserGlobal,
+                                  regGenScript = False,
+                                  regInPlace = False,
+                                  regWithHcPkg = Just ghcpkg,
+                                  regVerbose = verbosity
+                              }
           pdFile <- defaultPackageDesc verbosity
           pd <- readPackageDescription verbosity pdFile
           lbi <- getPersistBuildConfig
-          let -- XXX This is an almighty hack, shadowing the base Setup.hs hack
-              lib' = case library pd of
-                         Just lib ->
-                             lib {
-                                 exposedModules = filter (("GHC.Prim" /=))
-                                                $ exposedModules lib
-                                 }
-                         Nothing ->
-                             error "Expected a library, but none found"
-              pd' = pd { library = Just lib' }
-              -- When installing we need to use the non-inplace ghc-pkg.
-              -- We also set the compiler to be non-inplace, but that
-              -- probably doesn't matter.
-              c = compiler lbi
-              c' = c { compilerPath = dropInPlace (compilerPath c),
-                       compilerPkgTool = dropInPlace (compilerPkgTool c)
-                     }
-              lbi' = lbi { compiler = c' }
-          (instHook simpleUserHooks) pd' lbi' userHooks installFlags
-
-dropInPlace :: FilePath -> FilePath
-dropInPlace "" = ""
-dropInPlace xs@(x:xs') = case dropPrefix "-inplace" xs of
-                             Nothing -> x : dropInPlace xs'
-                             Just xs'' -> dropInPlace xs''
-
-dropPrefix :: Eq a => [a] -> [a] -> Maybe [a]
-dropPrefix [] ys = Just ys
-dropPrefix (x:xs) (y:ys)
- | x == y = dropPrefix xs ys
-dropPrefix _ _ = Nothing
+          let -- XXX These are almighty hacks, shadowing the base
+              -- Setup.hs hacks
+              extraExtraLibs = if (os == "mingw32") &&
+                                  (pkgName (package pd) == "base")
+                               then ["wsock32", "msvcrt", "kernel32",
+                                     "user32", "shell32"]
+                               else []
+              mkLib filt = case library pd of
+                           Just lib ->
+                               let ems = filter filt $ 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"
+              -- 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 }
+              -- 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_reg = lbi { libsubdir = "$pkgid" }
+          (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
+          (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
+          return ()