[project @ 2000-11-22 10:01:45 by sewardj]

compiling-with-4.08.1 wibbles

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 9970fa1..ace5c94 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.115 2000/11/19 18:39:53 simonmar Exp $
+# $Id: Makefile,v 1.116 2000/11/22 10:01:45 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -165,7 +165,7 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts \
   -Rghc-timing -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS)) 
+  -i$(subst $(space),:,$(DIRS)) -O -H32m -prof
 
 ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
 ifeq "$(ghc_407_at_least)" "1"

diff --git a/ghc/compiler/compMan/CompManager.lhs b/ghc/compiler/compMan/CompManager.lhs
index 475c8dd..9148829 100644 (file)
--- a/ghc/compiler/compMan/CompManager.lhs
+++ b/ghc/compiler/compMan/CompManager.lhs
@@ -42,9 +42,9 @@ import ErrUtils               ( showPass )
 import Util
 import Outputable
 import Panic           ( panic )
+import CmdLineOpts     ( DynFlags(..) )
 
 #ifdef GHCI
-import CmdLineOpts     ( DynFlags(..) )
 import Interpreter     ( HValue )
 import HscMain         ( hscExpr, hscTypeExpr )
 import RdrName

diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index 1fab4d2..8360fc0 100644 (file)
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -388,6 +388,13 @@ myCoreToStg dflags this_mod tidy_binds
 %************************************************************************
 
 \begin{code}
+#ifndef GHCI
+hscExpr dflags hst hit pcs this_module expr
+  = panic "hscExpr: non-interactive build"
+hscTypeExpr dflags hst hit pcs0 this_module expr
+  = panic "hscTypeExpr: non-interactive build"
+#else 
+
 hscExpr
   :: DynFlags
   -> HomeSymbolTable   
@@ -397,11 +404,6 @@ hscExpr
   -> String                    -- The expression
   -> IO ( PersistentCompilerState, Maybe UnlinkedIExpr )
 
-#ifndef GHCI
-hscExpr dflags hst hit pcs this_module expr
-  = panic "hscExpr: non-interactive build"
-#else 
-
 hscExpr dflags hst hit pcs0 this_module expr
    = do {
        -- parse, rename & typecheck the expression