X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FSysTools.lhs;h=934755d1b1155d044856f44f19d640c78c3c4e5c;hb=2f8e954150d5eccd91567b1e2f21bb04f617f427;hp=484e9e20a261c7fe9aaf96058fe9e7bd6e902fa4;hpb=1a3efdd6b616f3a101e182f715df5a0e306eb348;p=ghc-hetmet.git

diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index 484e9e2..934755d 100644
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -74,7 +74,7 @@ import CString		( CString, peekCString )
 
 import System.Process	( runInteractiveProcess, getProcessExitCode )
 import Control.Concurrent( forkIO, newChan, readChan, writeChan )
-import FastString       ( mkFastString )
+import FastString
 import SrcLoc           ( SrcLoc, mkSrcLoc, noSrcSpan, mkSrcSpan )
 \end{code}
 
@@ -167,13 +167,7 @@ initSysTools mbMinusB dflags
 	; let installed, installed_bin :: FilePath -> FilePath
               installed_bin pgm   =  top_dir </> pgm
 	      installed     file  =  top_dir </> file
-	      inplace dir   pgm   =  top_dir </> 
-#ifndef darwin_TARGET_OS
--- Not sure where cPROJECT_DIR makes sense, on Mac OS, building with
--- xcodebuild, it surely is a *bad* idea!  -=chak
-                                     cPROJECT_DIR </> 
-#endif
-                                     dir </> pgm
+	      inplace dir   pgm   =  top_dir </> dir </> pgm
 
 	; let pkgconfig_path
 		| am_installed = installed "package.conf"
@@ -207,31 +201,9 @@ initSysTools mbMinusB dflags
 		| otherwise    = "windres"
 
 	; let dflags0 = defaultDynFlags
-#ifndef mingw32_HOST_OS
-	-- check whether TMPDIR is set in the environment
-	; e_tmpdir <- IO.try (getEnv "TMPDIR") -- fails if not set
-#else
-	  -- On Win32, consult GetTempPath() for a temp dir.
-	  --  => it first tries TMP, TEMP, then finally the
-	  --   Windows directory(!). The directory is in short-path
-	  --   form.
-	; e_tmpdir <- 
-            IO.try (do
-	        let len = (2048::Int)
-		buf  <- mallocArray len
-		ret  <- getTempPath len buf
-		if ret == 0 then do
-		      -- failed, consult TMPDIR.
- 	             free buf
-		     getEnv "TMPDIR"
-		  else do
-		     s <- peekCString buf
-		     free buf
-		     return s)
-#endif
-        ; let dflags1 = case e_tmpdir of
-			  Left _  -> dflags0
-			  Right d -> setTmpDir d dflags0
+
+        ; tmpdir <- getTemporaryDirectory
+        ; let dflags1 = setTmpDir tmpdir dflags0
 
 	-- Check that the package config exists
 	; config_exists <- doesFileExist pkgconfig_path
@@ -641,7 +613,7 @@ getTempDir dflags@(DynFlags{tmpDir=tmp_dir})
                          in do createDirectory dirname
                                let mapping' = addToFM mapping tmp_dir dirname
                                writeIORef v_DirsToClean mapping'
-                               debugTraceMsg dflags 2 (ptext SLIT("Created temporary directory:") <+> text dirname)
+                               debugTraceMsg dflags 2 (ptext (sLit "Created temporary directory:") <+> text dirname)
                                return dirname
                             `IO.catch` \e ->
                                     if isAlreadyExistsError e
@@ -685,8 +657,8 @@ removeWith :: DynFlags -> (FilePath -> IO ()) -> FilePath -> IO ()
 removeWith dflags remover f = remover f `IO.catch`
   (\e ->
    let msg = if isDoesNotExistError e
-             then ptext SLIT("Warning: deleting non-existent") <+> text f
-             else ptext SLIT("Warning: exception raised when deleting")
+             then ptext (sLit "Warning: deleting non-existent") <+> text f
+             else ptext (sLit "Warning: exception raised when deleting")
                                             <+> text f <> colon
                $$ text (show e)
    in debugTraceMsg dflags 2 msg
@@ -880,7 +852,7 @@ traceCmd dflags phase_name cmd_line action
 	}}
   where
     handle_exn verb exn = do { debugTraceMsg dflags 2 (char '\n')
-			     ; debugTraceMsg dflags 2 (ptext SLIT("Failed:") <+> text cmd_line <+> text (show exn))
+			     ; debugTraceMsg dflags 2 (ptext (sLit "Failed:") <+> text cmd_line <+> text (show exn))
 	          	     ; throwDyn (PhaseFailed phase_name (ExitFailure 1)) }
 \end{code}