[project @ 2001-07-17 23:02:14 by sof]

wibble - the joys of CVS conflict merging

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index 2ac9d27..e1f5b51 100644 (file)
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -54,7 +54,7 @@ import IO
 import Directory       ( doesFileExist, removeFile )
 import IOExts          ( IORef, readIORef, writeIORef )
 import Monad           ( when, unless )
-import System          ( system, ExitCode(..), exitWith )
+import System          ( system, ExitCode(..), exitWith, getEnv )
 import CString
 import Int
 import Addr