projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Follow Cabal changes in ghci/Linker
[ghc-hetmet.git]
/
compiler
/
main
/
DriverPipeline.hs
diff --git
a/compiler/main/DriverPipeline.hs
b/compiler/main/DriverPipeline.hs
index
fd55544
..
7822d67
100644
(file)
--- a/
compiler/main/DriverPipeline.hs
+++ b/
compiler/main/DriverPipeline.hs
@@
-32,7
+32,7
@@
import Finder
import HscTypes
import Outputable
import Module
import HscTypes
import Outputable
import Module
-import UniqFM ( eltsUFM )
+import LazyUniqFM ( eltsUFM )
import ErrUtils
import DynFlags
import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) )
import ErrUtils
import DynFlags
import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) )
@@
-45,6
+45,7
@@
import Maybes ( expectJust )
import ParserCoreUtils ( getCoreModuleName )
import SrcLoc ( unLoc )
import SrcLoc ( Located(..) )
import ParserCoreUtils ( getCoreModuleName )
import SrcLoc ( unLoc )
import SrcLoc ( Located(..) )
+import FastString
import Control.Exception as Exception
import Data.IORef ( readIORef, writeIORef, IORef )
import Control.Exception as Exception
import Data.IORef ( readIORef, writeIORef, IORef )
@@
-304,11
+305,11
@@
link LinkBinary dflags batch_attempt_linking hpt
Right t -> any (t <) other_times
if not (dopt Opt_ForceRecomp dflags) && not linking_needed
Right t -> any (t <) other_times
if not (dopt Opt_ForceRecomp dflags) && not linking_needed
- then do debugTraceMsg dflags 2 (text exe_file <+> ptext SLIT("is up to date, linking not required."))
+ then do debugTraceMsg dflags 2 (text exe_file <+> ptext (sLit "is up to date, linking not required."))
return Succeeded
else do
return Succeeded
else do
- debugTraceMsg dflags 1 (ptext SLIT("Linking") <+> text exe_file
+ debugTraceMsg dflags 1 (ptext (sLit "Linking") <+> text exe_file
<+> text "...")
-- Don't showPass in Batch mode; doLink will do that for us.
<+> text "...")
-- Don't showPass in Batch mode; doLink will do that for us.
@@
-1625,6
+1626,5
@@
hscMaybeAdjustTarget dflags stop _ current_hsc_lang
-- otherwise, stick to the plan
| otherwise = current_hsc_lang
-- otherwise, stick to the plan
| otherwise = current_hsc_lang
-v_Split_info :: IORef (String, Int)
GLOBAL_VAR(v_Split_info, ("",0), (String,Int))
-- The split prefix and number of files
GLOBAL_VAR(v_Split_info, ("",0), (String,Int))
-- The split prefix and number of files