projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments only. Haddockify parts of TcRnTypes.
[ghc-hetmet.git]
/
ghc
/
Main.hs
diff --git
a/ghc/Main.hs
b/ghc/Main.hs
index
766577e
..
df90857
100644
(file)
--- a/
ghc/Main.hs
+++ b/
ghc/Main.hs
@@
-16,7
+16,8
@@
module Main (main) where
import qualified GHC
import GHC ( DynFlags(..), HscTarget(..),
GhcMode(..), GhcLink(..),
import qualified GHC
import GHC ( DynFlags(..), HscTarget(..),
GhcMode(..), GhcLink(..),
- LoadHowMuch(..), dopt, DynFlag(..) )
+ 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.)
@@
-153,7
+154,11
@@
main =
let flagWarnings = staticFlagWarnings
++ modeFlagWarnings
++ dynamicFlagWarnings
let flagWarnings = staticFlagWarnings
++ modeFlagWarnings
++ dynamicFlagWarnings
- liftIO $ handleFlagWarnings dflags2 flagWarnings
+
+ handleSourceError (\e -> do
+ GHC.printExceptionAndWarnings e
+ liftIO $ exitWith (ExitFailure 1)) $
+ handleFlagWarnings dflags2 flagWarnings
-- make sure we clean up after ourselves
GHC.defaultCleanupHandler dflags2 $ do
-- make sure we clean up after ourselves
GHC.defaultCleanupHandler dflags2 $ do
@@
-511,7
+516,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
-- ---------------------------------------------------------------------------