X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FPackageSrc.hs;h=762b86f63e3ab85b3e7d542b4b3ecdf72be5bd71;hb=4f2f158a207255e419eb2f74be3f4e760a605ade;hp=fa53901e06eb37ab9026203b1eaa394fb4c97757;hpb=fc4dcdd222e36c8ae79d9534fc1d166d91c38672;p=ghc-hetmet.git

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index fa53901..762b86f 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -46,7 +46,7 @@ package_details installing =
                             then [ clibdir ]
                             else [ ghc_src_dir cGHC_RUNTIME_DIR ],
         hs_libraries      = [ "HSrts" ],
-	extra_libraries   = [ "dl" ],
+	extra_libraries   = [],
         include_dirs   = if installing
                             then [ clibdir ++ "/includes" ]
                             else [ ghc_src_dir cGHC_INCLUDE_DIR ],
@@ -68,15 +68,23 @@ package_details installing =
          , "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"
+         , "PrelPtr_Ptr_con_info"
          , "PrelAddr_Wzh_con_info"
          , "PrelAddr_I64zh_con_info"
          , "PrelAddr_W64zh_con_info"
@@ -112,9 +120,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
 			 ]
         },
@@ -311,7 +321,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 +342,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 {