X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=60b1d6ede3e293573fefe551f5faf7b738ff9819;hb=4cef3202f8067fc3e9860e7a2b72c10b313b7366;hp=3379bd9d1ef106838b5e8e2c5c7eeb3390c812c2;hpb=8bbf522b424fae8c0189a8dd301344ab4216cb17;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 3379bd9..60b1d6e 100644
--- 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.65 2001/05/23 09:59:18 simonmar Exp $
+-- $Id: Main.hs,v 1.66 2001/05/28 03:31:19 sof Exp $
 --
 -- GHC Driver program
 --
@@ -87,13 +87,8 @@ import Maybe
 
 main =
   -- top-level exception handler: any unrecognised exception is a compiler bug.
-  handle (\exception -> 
-	  case exception of
-#if __GLASGOW_HASKELL__ >= 501
-	     ExitException _ -> throw exception
-#endif
-	     _other -> do hPutStr stderr (show (Panic (show exception)))
-			  exitWith (ExitFailure 1)
+  handle (\exception -> do hPutStr stderr (show (Panic (show exception)))
+			   exitWith (ExitFailure 1)
          ) $ do
 
   -- all error messages are propagated as exceptions
@@ -154,11 +149,17 @@ main =
 		writeIORef v_Pgm_L (installed "unlit")
 		writeIORef v_Pgm_m (installed "ghc-asm")
 		writeIORef v_Pgm_s (installed "ghc-split")
+#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS)
+		writeIORef v_Pgm_T (installed cTOUCH)
+#endif
 
 	else do writeIORef v_Path_usage (inplace (cGHC_DRIVER_DIR ++ "/ghc-usage.txt"))
 		writeIORef v_Pgm_L (inplace cGHC_UNLIT)
 		writeIORef v_Pgm_m (inplace cGHC_MANGLER)
 		writeIORef v_Pgm_s (inplace cGHC_SPLIT)
+#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS)
+		writeIORef v_Pgm_T (inplace cTOUCH)
+#endif
 
 	-- read the package configuration
    conf_file <- readIORef v_Path_package_config