projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings
[ghc-hetmet.git]
/
ghc
/
Main.hs
diff --git
a/ghc/Main.hs
b/ghc/Main.hs
index
06a5ceb
..
8bd9c8b
100644
(file)
--- a/
ghc/Main.hs
+++ b/
ghc/Main.hs
@@
-10,13
+10,12
@@
module Main (main) where
module Main (main) where
-#include "HsVersions.h"
-
-- The official GHC API
import qualified GHC
-- The official GHC API
import qualified GHC
-import GHC ( DynFlags(..), HscTarget(..),
- GhcMode(..), GhcLink(..),
- LoadHowMuch(..), dopt, DynFlag(..) )
+import GHC ( -- DynFlags(..), HscTarget(..),
+ -- GhcMode(..), GhcLink(..),
+ LoadHowMuch(..), -- dopt, DynFlag(..),
+ defaultCallbacks )
import CmdLineParser
-- Implementations of the various modes (--show-iface, mkdependHS. etc.)
import CmdLineParser
-- Implementations of the various modes (--show-iface, mkdependHS. etc.)
@@
-44,7
+43,7
@@
import Outputable
import SrcLoc
import Util
import Panic
import SrcLoc
import Util
import Panic
-import MonadUtils ( liftIO )
+-- import MonadUtils ( liftIO )
-- Standard Haskell libraries
import System.IO
-- Standard Haskell libraries
import System.IO
@@
-165,7
+164,7
@@
main =
liftIO $ showBanner cli_mode dflags2
-- we've finished manipulating the DynFlags, update the session
liftIO $ showBanner cli_mode dflags2
-- we've finished manipulating the DynFlags, update the session
- GHC.setSessionDynFlags dflags2
+ _ <- GHC.setSessionDynFlags dflags2
dflags3 <- GHC.getSessionDynFlags
hsc_env <- GHC.getSession
dflags3 <- GHC.getSessionDynFlags
hsc_env <- GHC.getSession
@@
-515,7
+514,7
@@
doMake srcs = do
doShowIface :: DynFlags -> FilePath -> IO ()
doShowIface dflags file = do
doShowIface :: DynFlags -> FilePath -> IO ()
doShowIface dflags file = do
- hsc_env <- newHscEnv dflags
+ hsc_env <- newHscEnv defaultCallbacks dflags
showIface hsc_env file
-- ---------------------------------------------------------------------------
showIface hsc_env file
-- ---------------------------------------------------------------------------