X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=14069e81e15ba8fb4526a5c4e63aac4ac2ba1719;hb=07ea55410545ef68074e7ae94516e93bd88e26bb;hp=f4fdfa795e9c0d1c74b225ff6c680bf2a1a46e98;hpb=430453c5131592b6147a80202dc5f7fbe3f3d5fd;p=ghc-hetmet.git

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index f4fdfa7..14069e8 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -8,6 +8,7 @@ import Distribution.Simple.Utils
 import Distribution.Verbosity
 import System.Cmd
 import System.Environment
+import System.Info
 
 main :: IO ()
 main = do args <- getArgs
@@ -42,12 +43,25 @@ doit pref ghcpkg verbosity =
           pdFile <- defaultPackageDesc verbosity
           pd <- readPackageDescription verbosity pdFile
           lbi <- getPersistBuildConfig
-          let -- XXX This is an almighty hack, shadowing the base Setup.hs hack
+          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 []
               lib' = case library pd of
                          Just lib ->
-                             lib {
-                                 exposedModules = filter (("GHC.Prim" /=))
-                                                $ exposedModules 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"