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

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index d42bf8c..5c83e7a 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -6,8 +6,8 @@ import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import Distribution.Verbosity
-import System.Cmd
 import System.Environment
+import System.Info
 
 main :: IO ()
 main = do args <- getArgs
@@ -44,26 +44,29 @@ doit pref ghcpkg verbosity =
           lbi <- getPersistBuildConfig
           let -- XXX These are almighty hacks, shadowing the base
               -- Setup.hs hacks
-              extraExtraLibs = if pkgName (package pd) == "base"
+              extraExtraLibs = if (os == "mingw32") &&
+                                  (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' }
+              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 }
@@ -71,8 +74,8 @@ doit pref ghcpkg verbosity =
               -- $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 { libsubdir = "$pkgid" }
+          (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
+          (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
           return ()