[project @ 2002-02-04 03:40:31 by chak]

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

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index f37f912..6a1036a 100644 (file)
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -35,6 +35,8 @@ package_details installing
  , cGHC_RUNTIME_DIR
  , cGHC_UTILS_DIR
  , cGHC_INCLUDE_DIR
+ , cX_CFLAGS
+ , cX_LIBS
  ] =
 
  [
@@ -62,7 +64,13 @@ package_details installing
         import_dirs    = [],
         source_dirs    = [],
         library_dirs   = if installing
-                            then [ "$libdir" ]
+                            then 
+#ifdef mingw32_TARGET_OS
+                               -- force the dist-provided gcc-lib/ into scope.
+                                [ "$libdir", "$libdir/gcc-lib" ]
+#else
+                                [ "$libdir" ]
+#endif
                             else [ ghc_src_dir cGHC_RUNTIME_DIR ],
         hs_libraries      = [ "HSrts" ],
        extra_libraries   =
@@ -74,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"
@@ -125,8 +137,9 @@ package_details installing
          , "PrelIOBase_heapOverflow_closure"
          , "PrelIOBase_NonTermination_closure"
          , "PrelIOBase_BlockedOnDeadMVar_closure"
+         , "PrelIOBase_Deadlock_closure"
          , "PrelWeak_runFinalizzerBatch_closure"
-         , "__init_Prelude"
+         , "__stginit_Prelude"
          ])
         },
 
@@ -154,7 +167,7 @@ package_details installing
                             ,
        extra_libraries   = [ "HSstd_cbits" ] ++
 #                           ifdef mingw32_TARGET_OS
-                            [ "wsock32", "msvcrt" ]
+                            [ "wsock32", "msvcrt", "kernel32", "user32" ]
 #                           else
                             [ ]
 #                           endif
@@ -406,26 +419,34 @@ package_details installing
          extra_ghc_opts = [],
          extra_cc_opts  = [],
          extra_ld_opts  = []
-        },
-
-         Package {
-         name           = "com",
-         import_dirs    = if installing
-                             then [ "$libdir/imports/com" ]
-                             else [ "$libdir/hdirect/lib" ],
-         source_dirs    = [],
-         library_dirs   = if installing
-                             then [ "$libdir" ]
-                             else [ "$libdir/hdirect/lib" ],
-         hs_libraries      = [ "HScom" ],
-        extra_libraries   = [ "user32",  "ole32",  "oleaut32", "advapi32" ],
-         include_dirs   = [],
-         c_includes     = [],           -- ???
-         package_deps   = [ "lang" ],
-         extra_ghc_opts = [],
-         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 {
@@ -446,8 +467,8 @@ package_details installing
          c_includes     = [ "HsXlib.h" ],
          package_deps   = [ "greencard" ],
          extra_ghc_opts = [],
-         extra_cc_opts  = [],
-         extra_ld_opts  = []
+         extra_cc_opts  = [ cX_CFLAGS ],
+         extra_ld_opts  = [ cX_LIBS ]
         }
 
          ,Package {
@@ -456,7 +477,9 @@ package_details installing
                              then [ "$libdir/imports/HGL" ]
                              else [ "$libdir/hslibs/graphics/lib/x11" ],
          source_dirs    = [],
-         library_dirs   = [],
+         library_dirs   = if installing
+                             then [ "$libdir" ]
+                             else [ "$libdir/hslibs/graphics/lib/x11"],
          hs_libraries   = [ "HSHGL" ],
         extra_libraries= [],
          include_dirs   = [],