diff options
author | Ian Lynagh <igloo@earth.li> | 2012-07-20 16:54:01 +0100 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-07-20 16:54:01 +0100 |
commit | 2844abb416975d589ab598162e70eff0df49751f (patch) | |
tree | 04751d84c518758d3a37d4382dae161d4804395f /compiler/main | |
parent | 8a1334404cee2f1d668bc77786b1d6381877612c (diff) | |
download | haskell-2844abb416975d589ab598162e70eff0df49751f.tar.gz |
GHC 7.4 is now required for building HEAD
Diffstat (limited to 'compiler/main')
-rw-r--r-- | compiler/main/InteractiveEval.hs | 4 | ||||
-rw-r--r-- | compiler/main/SysTools.lhs | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 60681fc6e7..a797329930 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -76,11 +76,7 @@ import Data.Dynamic import Data.Either import Data.List (find) import Control.Monad -#if __GLASGOW_HASKELL__ >= 701 import Foreign.Safe -#else -import Foreign hiding (unsafePerformIO) -#endif import Foreign.C import GHC.Exts import Data.Array diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index a75a3bc5b4..da24631b97 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -596,7 +596,6 @@ copyWithHeader dflags purpose maybe_header from to = do hClose hout hClose hin where -#if __GLASGOW_HASKELL__ >= 702 -- write the header string in UTF-8. The header is something like -- {-# LINE "foo.hs" #-} -- and we want to make sure a Unicode filename isn't mangled. @@ -604,9 +603,6 @@ copyWithHeader dflags purpose maybe_header from to = do hSetEncoding h utf8 hPutStr h str hSetBinaryMode h True -#else - header h str = hPutStr h str -#endif -- | read the contents of the named section in an ELF object as a -- String. @@ -782,11 +778,7 @@ runSomethingWith runSomethingWith dflags phase_name pgm args io = do let real_args = filter notNull (map showOpt args) -#if __GLASGOW_HASKELL__ >= 701 cmdLine = showCommandForUser pgm real_args -#else - cmdLine = unwords (pgm:real_args) -#endif traceCmd dflags phase_name cmdLine $ handleProc pgm phase_name $ io real_args handleProc :: String -> String -> IO (ExitCode, r) -> IO r |