From d5b1999089dd4a45cf872f88dd0d49e1207a3161 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Wed, 26 Sep 2007 08:48:02 +0000 Subject: [PATCH] Remove current package from preloaded package set --- compiler/main/Packages.lhs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index a59e60c..9904fdf 100644 --- 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] - 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)) -- 1.7.10.4