[project @ 2001-04-30 16:01:52 by sewardj]

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

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index bdd4c30..d46d529 100644 (file)
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -226,8 +226,7 @@ package_details installing
                              else [ cFPTOOLS_TOP_ABS ++ "/hslibs/net"
                                   , cFPTOOLS_TOP_ABS ++ "/hslibs/net/cbits" ],
          hs_libraries      = [ "HSnet" ],
-        extra_libraries   = [ "HSnet_cbits" ] 
-                             ++ if suffixMatch "solaris2" cTARGETPLATFORM
+        extra_libraries   = if suffixMatch "solaris2" cTARGETPLATFORM
                                 then [ "nsl",  "socket" ]
                                 else []
                              ,
@@ -300,7 +299,7 @@ package_details installing
                              else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util"
                                   , cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
          hs_libraries      = [ "HSutil" ],
-        extra_libraries   = [ "HSutil_cbits" ],
+        extra_libraries   = [ "HSutil_cbits" ] ++ words cLibsReadline,
          include_dirs   = if installing
                              then []
                              else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
@@ -312,7 +311,7 @@ package_details installing
                          ],
          extra_ghc_opts = [],
          extra_cc_opts  = [],
-         extra_ld_opts  = words cLibsReadline
+         extra_ld_opts  = []
         },
 
         -- no cbits at the moment, we'll need to add one if this library