projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
compiler
/
ghci
/
Linker.lhs
diff --git
a/compiler/ghci/Linker.lhs
b/compiler/ghci/Linker.lhs
index
2cbe755
..
976fe92
100644
(file)
--- 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 )
-- Standard libraries
import Control.Monad ( when, filterM, foldM )
-
+
import Data.IORef ( IORef, readIORef, writeIORef, modifyIORef )
import Data.List ( partition, nub )
import Data.IORef ( IORef, readIORef, writeIORef, modifyIORef )
import Data.List ( partition, nub )
@@
-224,7
+224,7
@@
reallyInitDynLinker dflags
; initObjLinker
-- (b) Load packages from the command-line
; 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
-- (c) Link libraries from the command-line
; let optl = getOpts dflags opt_l