X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverPipeline.hs;h=0db12cd2546971365dea6762c98808dbf1951c33;hb=6837025d796bf1487be3d572937e18d0e2cf727b;hp=b9de30626ea01d8972b3607073eac57f92993fa8;hpb=2a83a2aa7b6213e6fc5df909012e272445efd476;p=ghc-hetmet.git

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index b9de306..0db12cd 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -53,7 +53,7 @@ import GHC.Exts		( Int(..) )
 import System.Directory
 import System.FilePath
 import System.IO
-import SYSTEM_IO_ERROR as IO
+import System.IO.Error as IO
 import Control.Monad
 import Data.List	( isSuffixOf )
 import Data.Maybe
@@ -130,7 +130,7 @@ compile hsc_env0 summary mod_index nmods mb_old_iface maybe_old_linkable
 				extCoreName = basename ++ ".hcr" }
    let hsc_env' = hsc_env { hsc_dflags = dflags' }
 
-   -- -no-recomp should also work with --make
+   -- -fforce-recomp should also work with --make
    let force_recomp = dopt Opt_ForceRecomp dflags
        source_unchanged = isJust maybe_old_linkable && not force_recomp
        object_filename = ml_obj_file location
@@ -295,7 +295,7 @@ link LinkBinary dflags batch_attempt_linking hpt
 
         -- if the modification time on the executable is later than the
         -- modification times on all of the objects, then omit linking
-        -- (unless the -no-recomp flag was given).
+        -- (unless the -fforce-recomp flag was given).
         e_exe_time <- IO.try $ getModificationTime exe_file
         extra_ld_inputs <- readIORef v_Ld_inputs
         extra_times <- mapM (IO.try . getModificationTime) extra_ld_inputs
@@ -389,7 +389,9 @@ doLink dflags stop_phase o_files
   where
    -- Always link in the haskell98 package for static linking.  Other
    -- packages have to be specified via the -package flag.
-    link_pkgs = [haskell98PackageId]
+    link_pkgs
+     | dopt Opt_AutoLinkPackages dflags = [haskell98PackageId]
+     | otherwise                        = []
 
 
 -- ---------------------------------------------------------------------------