[project @ 2000-10-06 15:35:47 by simonmar]

Initialise the object linker if we're in GHCi.

diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c
index 48ae736..f992f1b 100644 (file)
--- a/ghc/rts/RtsStartup.c
+++ b/ghc/rts/RtsStartup.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.42 2000/04/20 13:20:31 simonmar Exp $
+ * $Id: RtsStartup.c,v 1.43 2000/10/06 15:35:47 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -23,6 +23,11 @@
 #include "StgStartup.h"
 #include "Prelude.h"           /* fixupRTStoPreludeRefs */
 
+#ifdef GHCI
+#include "HsFFI.h"
+#include "Linker.h"
+#endif
+
 #if defined(PROFILING) || defined(DEBUG)
 # include "Profiling.h"
 # include "ProfHeap.h"
@@ -143,6 +148,11 @@ startupHaskell(int argc, char *argv[], void *init_root)
     /* initialize the storage manager */
     initStorage();
 
+    /* initialise the object linker, if necessary */
+#ifdef GHCI
+    initLinker();
+#endif
+
     /* initialise the stable pointer table */
     initStablePtrTable();