Commit 417eb15f authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Merge branch 'master' of http://darcs.haskell.org//ghc

parents 78f588c1 7cae7521
......@@ -326,8 +326,7 @@ link' dflags batch_attempt_linking hpt
return Succeeded
else do
compilationProgressMsg dflags $ showSDoc dflags $
(ptext (sLit "Linking") <+> text exe_file <+> text "...")
compilationProgressMsg dflags ("Linking " ++ exe_file ++ " ...")
-- Don't showPass in Batch mode; doLink will do that for us.
let link = case ghcLink dflags of
......
......@@ -3,10 +3,6 @@
%
\begin{code}
{-# LANGUAGE BangPatterns #-}
{-# OPTIONS -fno-warn-unused-imports #-}
-- XXX GHC 6.9 seems to be confused by unpackCString# being used only in
-- a RULE
{-# OPTIONS_GHC -O -funbox-strict-fields #-}
-- We always optimise this, otherwise performance of a non-optimised
-- compiler is severely affected
......@@ -106,7 +102,6 @@ import Data.Maybe ( isJust )
import Data.Char ( ord )
import GHC.IO ( IO(..) )
import GHC.Ptr ( Ptr(..) )
#if __GLASGOW_HASKELL__ >= 701
import Foreign.Safe
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment