From: simonmar <unknown>
Date: Wed, 8 Nov 2000 15:14:03 +0000 (+0000)
Subject: [project @ 2000-11-08 15:14:03 by simonmar]
X-Git-Tag: Approximately_9120_patches~3398
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b5e15cf76947d63ef8b648da00e0185b0fe50ea1;p=ghc-hetmet.git

[project @ 2000-11-08 15:14:03 by simonmar]
fix heavy-handed merge-o :(
---

diff --git a/ghc/compiler/compMan/CmLink.lhs b/ghc/compiler/compMan/CmLink.lhs
index a39ed3d..c645192 100644
--- a/ghc/compiler/compMan/CmLink.lhs
+++ b/ghc/compiler/compMan/CmLink.lhs
@@ -82,8 +82,12 @@ instance Outputable Linkable where
    ppr (LP package_nm)       = text "LinkableP" <+> ptext package_nm
 
 emptyPLS :: IO PersistentLinkerState
-emptyPLS = return (PersistentLinkerState { closure_env = emptyClosureEnv, 
-                                           itbl_env    = emptyItblEnv })
+#ifdef GHCI
+emptyPLS = return (PersistentLinkerState { closure_env = emptyFM, 
+                                           itbl_env    = emptyFM })
+#else
+emptyPLS = return (PersistentLinkerState {})
+#endif
 \end{code}
 
 \begin{code}