[project @ 2001-12-06 08:24:36 by sof]

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

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 5c9d3e4..0856ab5 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   =
@@ -126,7 +134,7 @@ package_details installing
          , "PrelIOBase_NonTermination_closure"
          , "PrelIOBase_BlockedOnDeadMVar_closure"
          , "PrelWeak_runFinalizzerBatch_closure"
-         , "__init_Prelude"
+         , "__stginit_Prelude"
          ])
         },
 
@@ -154,7 +162,7 @@ package_details installing
                             ,
        extra_libraries   = [ "HSstd_cbits" ] ++
 #                           ifdef mingw32_TARGET_OS
-                            [ "wsock32", "msvcrt" ]
+                            [ "wsock32", "msvcrt", "kernel32" ]
 #                           else
                             [ ]
 #                           endif
@@ -397,33 +405,15 @@ 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 now built in
          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  = []
         }
 #endif
 
@@ -445,8 +435,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 {
@@ -455,7 +445,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   = [],