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:
478c200
)
Remove current package from preloaded package set
author
Clemens Fruhwirth
<clemens@endorphin.org>
Wed, 26 Sep 2007 08:48:02 +0000
(08:48 +0000)
committer
Clemens Fruhwirth
<clemens@endorphin.org>
Wed, 26 Sep 2007 08:48:02 +0000
(08:48 +0000)
compiler/main/Packages.lhs
patch
|
blob
|
history
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
a59e60c
..
9904fdf
100644
(file)
--- a/
compiler/main/Packages.lhs
+++ b/
compiler/main/Packages.lhs
@@
-527,7
+527,11
@@
mkPackageState dflags orig_pkg_db preload0 this_package = do
-- add base & rts to the preload packages
basicLinkedPackages = filter (flip elemUFM pkg_db)
[basePackageId,rtsPackageId]
-- add base & rts to the preload packages
basicLinkedPackages = filter (flip elemUFM pkg_db)
[basePackageId,rtsPackageId]
- preload2 = nub (basicLinkedPackages ++ map mkPackageId preload1)
+ -- but in any case remove the current package from the set of
+ -- preloaded packages so that base/rts does not end up in the
+ -- set up preloaded package when we are just building it
+ preload2 = nub (filter (/= new_this_pkg)
+ (basicLinkedPackages ++ map mkPackageId preload1))
-- Close the preload packages with their dependencies
dep_preload <- closeDeps pkg_db (zip preload2 (repeat Nothing))
-- Close the preload packages with their dependencies
dep_preload <- closeDeps pkg_db (zip preload2 (repeat Nothing))