X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FPackageSrc.hs;h=d46d529d34db4b8b584edb236e09ddee8f6be11b;hb=90e59feec13d702a5c3c36a3a95fd3d4566af35a;hp=bdd4c30103bd446dcfed7fedf201fc33e7acdeb2;hpb=27b4d2d763ce650fd5e5f9303d1f0e0c90a1cfcb;p=ghc-hetmet.git

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index bdd4c30..d46d529 100644
--- 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