X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=466da21026c9fc01e70b6eb630786c1ce48fb823;hp=5c83e7ac257b3ea5ae07a75426bb83cf0e8a6753;hb=b008746d6d36518b6e89484379e45c798d944743;hpb=916a1cabd18ccd9ffee4e9cc279aefb20f531fbf

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 5c83e7a..466da21 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -4,10 +4,8 @@ import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
 import Distribution.Verbosity
 import System.Environment
-import System.Info
 
 main :: IO ()
 main = do args <- getArgs
@@ -28,38 +26,22 @@ 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,
-                                  regGenScript = False,
-                                  regInPlace = False,
-                                  regWithHcPkg = Just ghcpkg,
                                   regVerbose = verbosity
                               }
-          pdFile <- defaultPackageDesc verbosity
-          pd <- readPackageDescription verbosity pdFile
           lbi <- getPersistBuildConfig
-          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 []
+          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
-                                   lib_bi = libBuildInfo lib
-                                   lib_bi' = lib_bi {
-                                                 extraLibs = extraExtraLibs
-                                                         ++ extraLibs lib_bi
-                                             }
                                in lib {
-                                      exposedModules = ems,
-                                      libBuildInfo = lib_bi'
+                                      exposedModules = ems
                                    }
                            Nothing ->
                                error "Expected a library, but none found"