X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=bdb8cf724a522d69c2fd0c2a00f2a3f2f53e8f78;hb=d787ad2f38cf4ee5564b30ebf0ccf2ccd8ccd38b;hp=ce3c0646d71df29bc33e1b24fa7fb59ed94569c6;hpb=7dd9870dde407ef1a505f0b124cecd11f98f9b45;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ce3c064..bdb8cf7 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -51,8 +51,6 @@ import Outputable
 import System.Environment ( getEnv )
 import Distribution.InstalledPackageInfo hiding (depends)
 import Distribution.Package hiding (depends, PackageId)
-import Distribution.Text
-import Distribution.Version
 import FastString
 import ErrUtils         ( debugTraceMsg, putMsg, Message )
 import Exception
@@ -267,8 +265,8 @@ mungePackagePaths top_dir ps = map munge_pkg ps
   munge_paths = map munge_path
 
   munge_path p 
-	  | Just p' <- maybePrefixMatch "$topdir"     p =            top_dir ++ p'
-	  | Just p' <- maybePrefixMatch "$httptopdir" p = toHttpPath top_dir ++ p'
+	  | Just p' <- stripPrefix "$topdir"     p =            top_dir ++ p'
+	  | Just p' <- stripPrefix "$httptopdir" p = toHttpPath top_dir ++ p'
 	  | otherwise				    = p
 
   toHttpPath p = "file:///" ++ p
@@ -390,7 +388,6 @@ findWiredInPackages dflags pkgs preload this_package = do
                             (basePackageId, [""]),
                             (rtsPackageId, [""]),
                             (haskell98PackageId, [""]),
-                            (sybPackageId, [""]),
                             (thPackageId, [""]),
                             (dphSeqPackageId, [""]),
                             (dphParPackageId, [""])]