From 5e54b553bbb112167412ee9164135d56b06f5721 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Wed, 6 Oct 2010 13:02:35 +0000
Subject: [PATCH] Don't automatically link the haskell98 package The default
 language is now Haskell2010, so this was a little odd.
 Also, --make is now on by default, so this was largely
 irrelevant.

---
 compiler/basicTypes/Module.lhs  |    4 +---
 compiler/ghci/Linker.lhs        |    2 +-
 compiler/main/DriverPipeline.hs |    8 +-------
 compiler/main/Packages.lhs      |    1 -
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index 072d011..06ac936 100644
--- a/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
@@ -35,7 +35,6 @@ module Module
 	integerPackageId,
 	basePackageId,
 	rtsPackageId,
-	haskell98PackageId,
 	thPackageId,
         dphSeqPackageId,
         dphParPackageId,
@@ -346,14 +345,13 @@ packageIdString = unpackFS . packageIdFS
 -- Make sure you change 'Packages.findWiredInPackages' if you add an entry here
 
 integerPackageId, primPackageId,
-  basePackageId, rtsPackageId, haskell98PackageId,
+  basePackageId, rtsPackageId,
   thPackageId, dphSeqPackageId, dphParPackageId,
   mainPackageId  :: PackageId
 primPackageId      = fsToPackageId (fsLit "ghc-prim")
 integerPackageId   = fsToPackageId (fsLit cIntegerLibrary)
 basePackageId      = fsToPackageId (fsLit "base")
 rtsPackageId	   = fsToPackageId (fsLit "rts")
-haskell98PackageId = fsToPackageId (fsLit "haskell98")
 thPackageId        = fsToPackageId (fsLit "template-haskell")
 dphSeqPackageId    = fsToPackageId (fsLit "dph-seq")
 dphParPackageId    = fsToPackageId (fsLit "dph-par")
diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index f7d925e..cc90cb5 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -964,7 +964,7 @@ partOfGHCi :: [PackageName]
 partOfGHCi
  | isWindowsTarget || isDarwinTarget = []
  | otherwise = map PackageName
-                   ["base", "haskell98", "template-haskell", "editline"]
+                   ["base", "template-haskell", "editline"]
 
 showLS :: LibrarySpec -> String
 showLS (Object nm)    = "(static) " ++ nm
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 464aa28..7c902e9 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -461,15 +461,9 @@ doLink dflags stop_phase o_files
   | otherwise
   = case ghcLink dflags of
         NoLink     -> return ()
-        LinkBinary -> linkBinary dflags o_files link_pkgs
+        LinkBinary -> linkBinary dflags o_files []
         LinkDynLib -> linkDynLib dflags o_files []
         other      -> panicBadLink other
-  where
-   -- Always link in the haskell98 package for static linking.  Other
-   -- packages have to be specified via the -package flag.
-    link_pkgs
-     | dopt Opt_AutoLinkPackages dflags = [haskell98PackageId]
-     | otherwise                        = []
 
 
 -- ---------------------------------------------------------------------------
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ff316aa..ec46a43 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -428,7 +428,6 @@ findWiredInPackages dflags pkgs = do
                             integerPackageId,
                             basePackageId,
                             rtsPackageId,
-                            haskell98PackageId,
                             thPackageId,
                             dphSeqPackageId,
                             dphParPackageId ]
-- 
1.7.10.4