diff options
| author | Clemens Fruhwirth <clemens@endorphin.org> | 2008-10-07 10:04:17 +0000 |
|---|---|---|
| committer | Clemens Fruhwirth <clemens@endorphin.org> | 2008-10-07 10:04:17 +0000 |
| commit | 7dd9870dde407ef1a505f0b124cecd11f98f9b45 (patch) | |
| tree | a7cb640b9dd0bf805d01624d9c71941c901c89ec | |
| parent | 9898358f3743548d00e55b26ab6784cadc2d6807 (diff) | |
| download | haskell-7dd9870dde407ef1a505f0b124cecd11f98f9b45.tar.gz | |
Revert AutoLinkPackages change for dynamic libraries. Cabal handles that now.
| -rw-r--r-- | compiler/main/Packages.lhs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index c5784ce386..ce3c0646d7 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 |