From: rrt <unknown>
Date: Tue, 5 Dec 2000 12:19:49 +0000 (+0000)
Subject: [project @ 2000-12-05 12:19:49 by rrt]
X-Git-Tag: Approximately_9120_patches~3203
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2c63b3b61a8e9f7b78ec179a46234c771dae4c78;p=ghc-hetmet.git

[project @ 2000-12-05 12:19:49 by rrt]
no_hs_main had become v_noHsMain, but I tried to reintroduce the old
version. Now hopefully fixed.
---

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 08a2fbe..f474f6c 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.25 2000/12/04 16:42:14 rrt Exp $
+-- $Id: DriverFlags.hs,v 1.26 2000/12/05 12:19:49 rrt Exp $
 --
 -- Driver flags
 --
@@ -194,7 +194,7 @@ static_flags =
 
 	------- Miscellaneous -----------------------------------------------
   ,  ( "no-link-chk"    , NoArg (return ()) ) -- ignored for backwards compat
-  ,  ( "no-hs-main"     , NoArg (writeIORef no_hs_main True) )
+  ,  ( "no-hs-main"     , NoArg (writeIORef v_noHsMain True) )
 
 	------- Output Redirection ------------------------------------------
   ,  ( "odir"		, HasArg (writeIORef v_Output_dir  . Just) )
diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 68e1981..5c32153 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverPipeline.hs,v 1.37 2000/12/05 12:15:19 rrt Exp $
+-- $Id: DriverPipeline.hs,v 1.38 2000/12/05 12:19:49 rrt Exp $
 --
 -- GHC Driver
 --
@@ -653,8 +653,6 @@ run_phase SplitAs basename _suff _input_fn _output_fn
 -----------------------------------------------------------------------------
 -- Linking
 
-GLOBAL_VAR(no_hs_main, False, Bool)
-
 doLink :: [String] -> IO ()
 doLink o_files = do
     ln <- readIORef v_Pgm_l