X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FPackageSrc.hs;h=6fcec811935923deb127367751df6e5e76e176c0;hb=fb7a723bfd7650a705cb226e07c5b08b7a8e9279;hp=85f56cc917aa1b197330553fc0fae09d810a5789;hpb=c82797403c38487a95452471653dcc1e6149a6e6;p=ghc-hetmet.git

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 85f56cc..6fcec81 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -1,4 +1,5 @@
 #include "../includes/config.h"
+#include "../includes/Derived.h"
 
 module Main (main) where
 
@@ -64,11 +65,16 @@ package_details installing
                             then [ "$libdir" ]
                             else [ ghc_src_dir cGHC_RUNTIME_DIR ],
         hs_libraries      = [ "HSrts" ],
-#ifndef mingw32_TARGET_OS
-	extra_libraries   = [ "m" ], -- libm, that is, for ldexp()
-#else
-        extra_libraries   = [ "winmm", "wsock32" ], -- winmm for the threadDelay timer, wsock32 for the linker
+	extra_libraries   =
+			      "m":		-- for ldexp()
+#ifdef mingw32_TARGET_OS
+			      "winmm":		-- for the threadDelay timer
+			      "wsock32":	-- for the linker
+#endif
+#ifdef USING_LIBBFD
+			      "bfd": "iberty":	-- for debugging
 #endif
+			    [],
         include_dirs   = if installing
                             then [ "$libdir/include"
 #ifdef mingw32_TARGET_OS
@@ -120,7 +126,7 @@ package_details installing
          , "PrelIOBase_NonTermination_closure"
          , "PrelIOBase_BlockedOnDeadMVar_closure"
          , "PrelWeak_runFinalizzerBatch_closure"
-         , "__init_Prelude"
+         , "__stginit_Prelude"
          ])
         },
 
@@ -150,7 +156,7 @@ package_details installing
 #                           ifdef mingw32_TARGET_OS
                             [ "wsock32", "msvcrt" ]
 #                           else
-                            [ "m" ]   -- libm, that is
+                            [ ]
 #                           endif
                             ,
         include_dirs   = if installing
@@ -391,11 +397,12 @@ package_details installing
          library_dirs   = if installing
                              then [ "$libdir" ]
                              else [ "$libdir/hslibs/win32" ],
-         hs_libraries      = [ "HSwin32" ],
-	 extra_libraries   = [ "user32",  "gdi32", "winmm" ],
+         hs_libraries      = [ "HSwin321", "HSwin322" ],
+	 extra_libraries   = [ "user32",  "gdi32", "winmm", 
+                               "kernel32", "advapi32" ],
          include_dirs   = [],
          c_includes     = [],           -- ???
-         package_deps   = [ "lang", "greencard" ],
+         package_deps   = [ "lang" ], -- greencard now built in
          extra_ghc_opts = [],
          extra_cc_opts  = [],
          extra_ld_opts  = []