Massive patch for the first months work adding System FC to GHC #13

[ghc-hetmet.git] / compiler / ghci / Linker.lhs

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 15117fe..976fe92 100644 (file)
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -44,8 +44,8 @@ import BasicTypes     ( SuccessFlag(..), succeeded, failed )
 import Outputable
 import PackageConfig    ( rtsPackageId )
 import Panic            ( GhcException(..) )
-import Util             ( zipLazy, global, joinFileExt, joinFileName, suffixOf,
-                         replaceFilenameSuffix )
+import Util             ( zipLazy, global, joinFileExt, joinFileName, 
+                          replaceFilenameSuffix )
 import StaticFlags     ( v_Ld_inputs, v_Build_tag )
 import ErrUtils         ( debugTraceMsg, mkLocMessage )
 import DriverPhases    ( phaseInputExt, Phase(..) )
@@ -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