X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fghci%2FLinker.lhs;h=ab4cafe246a5ec25086fccb0008a11c736ff6a4e;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=f897eecb1505baef3ca80879b4d0a7ee5addf1d5;hpb=4f457f34795745c1fad5847d1983887e7666a6b7;p=ghc-hetmet.git

diff --git a/ghc/compiler/ghci/Linker.lhs b/ghc/compiler/ghci/Linker.lhs
index f897eec..ab4cafe 100644
--- a/ghc/compiler/ghci/Linker.lhs
+++ b/ghc/compiler/ghci/Linker.lhs
@@ -20,7 +20,6 @@ module Linker ( HValue, showLinkerState,
 		linkPackages,
 	) where
 
-#include "../includes/ghcconfig.h"
 #include "HsVersions.h"
 
 import ObjLink		( loadDLL, loadObj, unloadObj, resolveObjs, initObjLinker )
@@ -122,9 +121,8 @@ emptyPLS dflags = PersistentLinkerState {
   -- The linker's symbol table is populated with RTS symbols using an
   -- explicit list.  See rts/Linker.c for details.
   where init_pkgs
-	  | Just rts_id <- rtsPackageId (pkgState dflags) = [rts_id]
+	  | ExtPackage rts_id <- rtsPackageId (pkgState dflags) = [rts_id]
 	  | otherwise = []
-
 \end{code}
 
 \begin{code}
@@ -386,7 +384,7 @@ getLinkDeps dflags hpt pit mods
 	-- Get the things needed for the specified module
 	-- This is rather similar to the code in RnNames.importsFromImportDecl
     get_deps mod
-	| ExternalPackage p <- mi_package iface
+	| ExtPackage p <- mi_package iface
 	= ([], p : dep_pkgs deps)
 	| otherwise
 	= (mod : [m | (m,_) <- dep_mods deps], dep_pkgs deps)