X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=976fe92a888231a19a9d2aadbadd2343048a5211;hb=27ca67931713c36f5ed248de88298416892e5649;hp=4449e07ef780115e61e25a5962daa193008aa642;hpb=b1e2a2d6175ba099cea5e76b4cc07584fcac23e1;p=ghc-hetmet.git diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 4449e07..976fe92 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -53,7 +53,7 @@ import SrcLoc ( SrcSpan ) -- Standard libraries import Control.Monad ( when, filterM, foldM ) - + import Data.IORef ( IORef, readIORef, writeIORef, modifyIORef ) import Data.List ( partition, nub ) @@ -196,7 +196,6 @@ We initialise the dynamic linker by a) calling the C initialisation procedure b) Loading any packages specified on the command line, - now held in v_ExplicitPackages c) Loading any packages specified on the command line, now held in the -l options in v_Opt_l @@ -225,7 +224,7 @@ reallyInitDynLinker dflags ; initObjLinker -- (b) Load packages from the command-line - ; linkPackages dflags (explicitPackages (pkgState dflags)) + ; linkPackages dflags (preloadPackages (pkgState dflags)) -- (c) Link libraries from the command-line ; let optl = getOpts dflags opt_l