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

[project @ 2000-12-05 16:59:03 by rrt]
Correct some merged variable names which have changed from_this toThis.
---

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index f474f6c..7db2531 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.26 2000/12/05 12:19:49 rrt Exp $
+-- $Id: DriverFlags.hs,v 1.27 2000/12/05 16:59:03 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 v_noHsMain 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 5c32153..c1ffd4d 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverPipeline.hs,v 1.38 2000/12/05 12:19:49 rrt Exp $
+-- $Id: DriverPipeline.hs,v 1.39 2000/12/05 16:59:03 rrt Exp $
 --
 -- GHC Driver
 --
@@ -430,7 +430,7 @@ run_phase Hsc basename suff input_fn output_fn
   -- date wrt M.hs (or M.o doesn't exist) so we must recompile regardless.
 	do_recomp <- readIORef v_Recomp
 	todo <- readIORef v_GhcMode
-        o_file' <- odir_ify (basename ++ '.':phase_input_ext Ln)
+        o_file' <- odir_ify (basename ++ '.':phaseInputExt Ln)
         o_file <- osuf_ify o_file'
 	source_unchanged <- 
           if not (do_recomp && ( todo == DoLink || todo == StopBefore Ln ))