X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FPackageSrc.hs;h=6a1036ae130563ff645375c803dd7070b4a7262d;hb=0299e1a135c5805e09ed8e2271b3b17fc8a04869;hp=0856ab5d7b07fcbefa3fefced0e61f4dba3dc8e5;hpb=7fe540d8c382712d2eab02a05556ed168311ae2e;p=ghc-hetmet.git

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 0856ab5..6a1036a 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -82,6 +82,10 @@ package_details installing
 #ifdef USING_LIBBFD
 			      "bfd": "iberty":	-- for debugging
 #endif
+#ifdef THREADED_RTS
+			      "pthread" :
+#endif
+
 			    [],
         include_dirs   = if installing
                             then [ "$libdir/include"
@@ -133,6 +137,7 @@ package_details installing
          , "PrelIOBase_heapOverflow_closure"
          , "PrelIOBase_NonTermination_closure"
          , "PrelIOBase_BlockedOnDeadMVar_closure"
+         , "PrelIOBase_Deadlock_closure"
          , "PrelWeak_runFinalizzerBatch_closure"
          , "__stginit_Prelude"
          ])
@@ -162,7 +167,7 @@ package_details installing
                             ,
 	extra_libraries   = [ "HSstd_cbits" ] ++
 #                           ifdef mingw32_TARGET_OS
-                            [ "wsock32", "msvcrt", "kernel32" ]
+                            [ "wsock32", "msvcrt", "kernel32", "user32" ]
 #                           else
                             [ ]
 #                           endif
@@ -415,6 +420,33 @@ package_details installing
          extra_cc_opts  = [],
          extra_ld_opts  = []
         }
+        ,Package {
+	 name = "objectio",
+	 import_dirs = if installing
+	               then ["$libdir/imports/objectio"]
+	               else ["$libdir/hslibs/object-io/ObjectIO","$libdir/hslibs/object-io/OSWindows"],
+	 source_dirs = [],
+	 library_dirs = if installing
+	                then [ "$libdir" ]
+	                else [ "$libdir/hslibs/object-io"],
+	 hs_libraries = ["HSobjectio"],
+	 extra_libraries =
+		       ["user32",
+			"gdi32",
+			"kernel32",
+			"comctl32",
+			"comdlg32",
+			"shell32",
+			"winmm",
+			"winspool",
+			"ole32"],
+	 include_dirs = [],
+	 c_includes = [],
+	 package_deps = ["concurrent", "lang"],
+	 extra_ghc_opts = [],
+	 extra_cc_opts = [],
+	 extra_ld_opts = []
+	}
 #endif
 
          ,Package {