[project @ 2001-01-30 10:56:55 by simonmar]

[ghc-hetmet.git] / ghc / driver / PackageSrc.hs

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 4410b8e..5964ec8 100644 (file)
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -67,19 +67,22 @@ package_details installing =
          , "PrelBase_Czh_static_info"
          , "PrelFloat_Fzh_static_info"
          , "PrelFloat_Dzh_static_info"
-         , "PrelAddr_Azh_static_info"
-         , "PrelAddr_Wzh_static_info"
-         , "PrelAddr_I64zh_static_info"
-         , "PrelAddr_W64zh_static_info"
+         , "PrelPtr_Ptr_static_info"
+         , "PrelWord_Wzh_static_info"
+         , "PrelInt_I8zh_static_info"
+         , "PrelInt_I16zh_static_info"
+         , "PrelInt_I32zh_static_info"
+         , "PrelInt_I64zh_static_info"
+         , "PrelWord_W8zh_static_info"
+         , "PrelWord_W16zh_static_info"
+         , "PrelWord_W32zh_static_info"
+         , "PrelWord_W64zh_static_info"
          , "PrelStable_StablePtr_static_info"
          , "PrelBase_Izh_con_info"
          , "PrelBase_Czh_con_info"
          , "PrelFloat_Fzh_con_info"
          , "PrelFloat_Dzh_con_info"
-         , "PrelAddr_Azh_con_info"
-         , "PrelAddr_Wzh_con_info"
-         , "PrelAddr_I64zh_con_info"
-         , "PrelAddr_W64zh_con_info"
+         , "PrelPtr_Ptr_con_info"
          , "PrelStable_StablePtr_con_info"
          , "PrelBase_False_closure"
          , "PrelBase_True_closure"
@@ -112,9 +115,11 @@ package_details installing =
         package_deps   = [ "rts" ],
         extra_ghc_opts = [],
         extra_cc_opts  = [],
-        extra_ld_opts  = [ "-lm"
+        extra_ld_opts  = [
 #ifdef mingw32_TARGET_OS
-                        , "-lwsock32"
+                           "-lwsock32"
+#else
+                           "-lm"
 #endif
                         ]
         },
@@ -138,7 +143,13 @@ package_details installing =
          package_deps   = [],
          extra_ghc_opts = [],
          extra_cc_opts  = [],
-         extra_ld_opts  = []
+         extra_ld_opts  = [
+#ifndef LEADING_UNDERSCORE
+                         "-u Addr_Azh_static_info"
+#else
+                         "-u _Addr_Azh_static_info"
+#endif
+                       ]
         },
 
          Package {
@@ -311,7 +322,7 @@ package_details installing =
          extra_libraries   = [],
          include_dirs   = [],
          c_includes     = [],
-         package_deps   = [],
+         package_deps   = [ "lang" ],
          extra_ghc_opts = [],
          extra_cc_opts  = [],
          extra_ld_opts  = [],
@@ -332,7 +343,7 @@ package_details installing =
          package_deps   = [ "lang", "greencard" ],
          extra_ghc_opts = [],
          extra_cc_opts  = [],
-         extra_ld_opts  = [ "-luser32",  "-lgdi32" ]
+         extra_ld_opts  = [ "-luser32",  "-lgdi32", "-lwinmm" ]
         },
 
          Package {