X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=2f72dfd7dc0f62fdc6e59b648fdd364a4cff51d9;hb=d97181b732076e19bbc109e6cc6393132a25af12;hp=892171c1edf5136942457c4915cc1991434e514b;hpb=d51f42f602bf9a6d1b356c41228a534c88723f65;p=ghc-hetmet.git

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 892171c..2f72dfd 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -538,9 +538,9 @@ checkNonStdWay dflags srcspan = do
 	else return (Just default_osuf)
 
 failNonStd srcspan = dieWith srcspan $
-  ptext SLIT("Dynamic linking required, but this is a non-standard build (eg. prof).") $$
-  ptext SLIT("You need to build the program twice: once the normal way, and then") $$
-  ptext SLIT("in the desired way using -osuf to set the object file suffix.")
+  ptext (sLit "Dynamic linking required, but this is a non-standard build (eg. prof).") $$
+  ptext (sLit "You need to build the program twice: once the normal way, and then") $$
+  ptext (sLit "in the desired way using -osuf to set the object file suffix.")
   
 
 getLinkDeps :: HscEnv -> HomePackageTable -> PackageIfaceTable
@@ -618,15 +618,15 @@ getLinkDeps hsc_env hpt pit maybe_normal_osuf span mods
     get_iface mod = case lookupIfaceByModule dflags hpt pit mod of
 			    Just iface -> iface
 			    Nothing    -> pprPanic "getLinkDeps" (no_iface mod)
-    no_iface mod = ptext SLIT("No iface for") <+> ppr mod
+    no_iface mod = ptext (sLit "No iface for") <+> ppr mod
 	-- This one is a GHC bug
 
     no_obj mod = dieWith span $
-		     ptext SLIT("cannot find object file for module ") <> 
+		     ptext (sLit "cannot find object file for module ") <> 
 			quotes (ppr mod) $$
 		     while_linking_expr
 		
-    while_linking_expr = ptext SLIT("while linking an interpreted expression")
+    while_linking_expr = ptext (sLit "while linking an interpreted expression")
 
 	-- This one is a build-system bug
 
@@ -662,7 +662,7 @@ getLinkDeps hsc_env hpt pit maybe_normal_osuf span mods
 		ok <- doesFileExist new_file
 		if (not ok)
 		   then dieWith span $
-			  ptext SLIT("cannot find normal object file ")
+			  ptext (sLit "cannot find normal object file ")
 				<> quotes (text new_file) $$ while_linking_expr
 		   else return (DotO new_file)
 \end{code}
@@ -947,7 +947,7 @@ partOfGHCi
 #          if defined(mingw32_TARGET_OS) || defined(darwin_TARGET_OS)
            = [ ]
 #          else
-           = [ "base", "haskell98", "template-haskell", "readline" ]
+           = [ "base", "haskell98", "template-haskell", "editline" ]
 #          endif
 
 showLS (Object nm)    = "(static) " ++ nm