[project @ 2001-08-07 10:54:01 by simonmar]

Back out the ExitException change; it's already taken into account by
DriverUtil.handle.

Sigbjorn: I'm not sure what was going on with your Win32 build, but it
looks like it was a bug somewhere else.

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 5a7d6c5..a62e332 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -fno-warn-incomplete-patterns #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.83 2001/08/03 23:38:50 ken Exp $
+-- $Id: Main.hs,v 1.84 2001/08/07 10:54:01 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -114,12 +114,8 @@ main =
   handle (\exception -> do
           case exception of
                -- an IO exception probably isn't our fault, so don't panic
-               IOException _   ->  hPutStr stderr (show exception)
-#if __GLASGOW_HASKELL__ >= 501
-                 -- let exit exceptions bubble all the way out.
-               ExitException e ->  exitWith e
-#endif
-               _other          ->  hPutStr stderr (show (Panic (show exception)))
+               IOException _ ->  hPutStr stderr (show exception)
+               _other        ->  hPutStr stderr (show (Panic (show exception)))
           exitWith (ExitFailure 1)
          ) $ do