X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=c5784ce3860dde58447372f54d219e8142c324cd;hb=6949d66c042df3a848fb9759604494f306903d20;hp=e2a0a047f2834d4e85a9fad0606706c3a712ed09;hpb=880a6b90ba6d93e55a464bea585f9d7c5e4abfb3;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index e2a0a04..c5784ce 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -37,7 +37,7 @@ where
 
 import PackageConfig	
 import ParsePkgConf	( loadPackageConfig )
-import DynFlags		( dopt, DynFlag(..), DynFlags(..), PackageFlag(..) )
+import DynFlags		( dopt, DynFlag(..), DynFlags(..), PackageFlag(..), GhcLink(..) )
 import StaticFlags	( opt_Static )
 import Config		( cProjectVersion )
 import Name		( Name, nameModule_maybe )
@@ -393,8 +393,7 @@ findWiredInPackages dflags pkgs preload this_package = do
                             (sybPackageId, [""]),
                             (thPackageId, [""]),
                             (dphSeqPackageId, [""]),
-                            (dphParPackageId, [""]),
-                            (ndpPackageId, ["-seq", "-par"]) ]
+                            (dphParPackageId, [""])]
 
         matches :: PackageConfig -> (PackageId, [String]) -> Bool
         pc `matches` (pid, suffixes)
@@ -564,7 +563,7 @@ mkPackageState dflags orig_pkg_db preload0 this_package = do
 
       -- add base & rts to the preload packages
       basicLinkedPackages
-       | dopt Opt_AutoLinkPackages dflags
+       | dopt Opt_AutoLinkPackages dflags && (ghcLink dflags) /= LinkDynLib
           = filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId]
        | otherwise = []
       -- but in any case remove the current package from the set of