[project @ 2000-10-27 14:56:00 by sewardj]

Avoid circularity between these two on Win32.

diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs
index f3299af..f7092fd 100644 (file)
--- a/ghc/compiler/main/DriverState.hs
+++ b/ghc/compiler/main/DriverState.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.8 2000/10/26 16:51:44 sewardj Exp $
+-- $Id: DriverState.hs,v 1.9 2000/10/27 14:56:00 sewardj Exp $
 --
 -- Settings for the driver
 --
@@ -110,9 +110,6 @@ v_Hs_source_cpp_opts = global
 GLOBAL_VAR(v_Verbose, False, Bool)
 is_verbose = do v <- readIORef v_Verbose; if v then return "-v" else return ""
 
--- where to keep temporary files
-GLOBAL_VAR(v_TmpDir,       cDEFAULT_TMPDIR,  String   )
-
 -- Keep output from intermediate phases
 GLOBAL_VAR(v_Keep_hi_diffs,            False,          Bool)
 GLOBAL_VAR(v_Keep_hc_files,            False,          Bool)

diff --git a/ghc/compiler/main/TmpFiles.hs b/ghc/compiler/main/TmpFiles.hs
index dd45242..cefb53e 100644 (file)
--- a/ghc/compiler/main/TmpFiles.hs
+++ b/ghc/compiler/main/TmpFiles.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: TmpFiles.hs,v 1.5 2000/10/27 13:50:25 sewardj Exp $
+-- $Id: TmpFiles.hs,v 1.6 2000/10/27 14:56:00 sewardj Exp $
 --
 -- Temporary file management
 --
@@ -16,7 +16,6 @@ module TmpFiles (
  ) where
 
 -- main
-import DriverState
 import Config
 import Util
 
@@ -33,6 +32,8 @@ import Monad
 #include "HsVersions.h"
 
 GLOBAL_VAR(v_FilesToClean, [],               [String] )
+GLOBAL_VAR(v_TmpDir,       cDEFAULT_TMPDIR,  String   )
+
 
 initTempFileStorage = do
        -- check whether TMPDIR is set in the environment