X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=ce3c0646d71df29bc33e1b24fa7fb59ed94569c6;hb=5892af0e08fdb890b5a0b9a64346d9f7773a6ed8;hp=c5784ce3860dde58447372f54d219e8142c324cd;hpb=6949d66c042df3a848fb9759604494f306903d20;p=ghc-hetmet.git diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index c5784ce..ce3c064 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(..), GhcLink(..) ) +import DynFlags ( dopt, DynFlag(..), DynFlags(..), PackageFlag(..) ) import StaticFlags ( opt_Static ) import Config ( cProjectVersion ) import Name ( Name, nameModule_maybe ) @@ -563,7 +563,7 @@ mkPackageState dflags orig_pkg_db preload0 this_package = do -- add base & rts to the preload packages basicLinkedPackages - | dopt Opt_AutoLinkPackages dflags && (ghcLink dflags) /= LinkDynLib + | dopt Opt_AutoLinkPackages dflags = filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId] | otherwise = [] -- but in any case remove the current package from the set of