X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=utils%2Frunghc%2Frunghc.hs;h=cdf06dc33f8294857b49b1a7ea5dd5e566304368;hp=1d4907dd472617a5eb2246bdd8a0e508593a3390;hb=246250d7bd57de6645c13d2e1d1525c583a9d509;hpb=7afd995197924dc6d650b51e160755d651ad1e0d

diff --git a/utils/runghc/runghc.hs b/utils/runghc/runghc.hs
index 1d4907d..cdf06dc 100644
--- a/utils/runghc/runghc.hs
+++ b/utils/runghc/runghc.hs
@@ -28,8 +28,13 @@ import Data.List
 import System.Exit
 import Data.Char
 
-import Compat.RawSystem 	( rawSystem )
-import Compat.Directory 	( findExecutable )
+#ifdef USING_COMPAT
+import Compat.RawSystem ( rawSystem )
+import Compat.Directory ( findExecutable )
+#else
+import System.Cmd       ( rawSystem )
+import System.Directory ( findExecutable )
+#endif
 
 main = do 
   args <- getArgs
@@ -53,13 +58,17 @@ doIt ghc args = do
 			"-ignore-dot-ghci" : ghc_args ++ 
 			[ "-e","System.Environment.withProgName "++show filename++" (System.Environment.withArgs ["
 			  ++ concat (intersperse "," (map show prog_args))
-			  ++ "] (GHC.TopHandler.runIOFastExit Main.main))", filename])
+			  ++ "] (GHC.TopHandler.runIOFastExit (Main.main Prelude.>> (Prelude.return ()))))", filename])
                -- runIOFastExit: makes exceptions raised by Main.main
                -- behave in the same way as for a compiled program.
                -- The "fast exit" part just calls exit() directly
                -- instead of doing an orderly runtime shutdown,
                -- otherwise the main GHCi thread will complain about
                -- being interrupted.
+               --
+               -- Why (main >> return ()) rather than just main?  Because
+               -- otherwise GHCi by default tries to evaluate the result
+               -- of the IO in order to show it (see #1200).
   	  exitWith res
 
 notArg ('-':_) = False