From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Fri, 3 Oct 2008 18:53:04 +0000 (+0000)
Subject: No AutoLinkPackages for dynamic library linking
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6949d66c042df3a848fb9759604494f306903d20

No AutoLinkPackages for dynamic library linking
---

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ce3c064..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 )
@@ -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
+       | 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