projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9898358
)
Revert AutoLinkPackages change for dynamic libraries. Cabal handles that now.
author
Clemens Fruhwirth
<clemens@endorphin.org>
Tue, 7 Oct 2008 10:04:17 +0000
(10:04 +0000)
committer
Clemens Fruhwirth
<clemens@endorphin.org>
Tue, 7 Oct 2008 10:04:17 +0000
(10:04 +0000)
compiler/main/Packages.lhs
patch
|
blob
|
history
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
c5784ce
..
ce3c064
100644
(file)
--- a/
compiler/main/Packages.lhs
+++ b/
compiler/main/Packages.lhs
@@
-37,7
+37,7
@@
where
import PackageConfig
import ParsePkgConf ( loadPackageConfig )
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 )
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
-- 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
= filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId]
| otherwise = []
-- but in any case remove the current package from the set of