From 7dd9870dde407ef1a505f0b124cecd11f98f9b45 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Tue, 7 Oct 2008 10:04:17 +0000 Subject: [PATCH] Revert AutoLinkPackages change for dynamic libraries. Cabal handles that now. --- compiler/main/Packages.lhs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 1.7.10.4