[project @ 2000-12-08 10:26:41 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / TmpFiles.hs

diff --git a/ghc/compiler/main/TmpFiles.hs b/ghc/compiler/main/TmpFiles.hs
index dd45242..b0c19d8 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.11 2000/12/07 08:20:46 simonpj Exp $
 --
 -- Temporary file management
 --
@@ -12,11 +12,11 @@ module TmpFiles (
    initTempFileStorage,  -- :: IO ()
    cleanTempFiles,       -- :: IO ()
    newTempName,                 -- :: Suffix -> IO FilePath
-   addFilesToClean      -- :: [FilePath] -> IO ()
+   addFilesToClean,     -- :: [FilePath] -> IO ()
+   v_TmpDir
  ) where
 
 -- main
-import DriverState
 import Config
 import Util
 
@@ -33,24 +33,29 @@ 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
    IO.try (do dir <- getEnv "TMPDIR" -- fails if not set
-             writeIORef v_TmpDir dir)
-
+#ifndef mingw32_TARGET_OS
+             writeIORef v_TmpDir dir
+#endif
+             return ()
+          )
 
 cleanTempFiles :: Bool -> IO ()
 cleanTempFiles verbose = do
   fs <- readIORef v_FilesToClean
 
   let blowAway f =
-          (do  when verbose (hPutStrLn stderr ("removing: " ++ f))
+          (do  when verbose (hPutStrLn stderr ("Removing: " ++ f))
                if '*' `elem` f then system ("rm -f " ++ f) >> return ()
                                else removeFile f)
            `catchAllIO`
           (\_ -> when verbose (hPutStrLn stderr 
-                               ("warning: can't remove tmp file" ++ f)))
+                               ("Warning: can't remove tmp file " ++ f)))
   mapM_ blowAway fs
 
 type Suffix = String