#
# -dcore-lint check the types after every pass of the compiler;
# a pretty strong internal check
-GhcHcOpts=-O
+GhcHcOpts=-O -Rghc-timing
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcWithHscBuiltViaC=@BootingFromHc@
GhcWithNativeCodeGen=NO
endif
-# Include GHCi in the compiler
-ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
-GhcWithInterpreter=YES
-else
+# Include GHCi in the compiler. Default to NO for the time being.
+
+# ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+# GhcWithInterpreter=YES
+# else
GhcWithInterpreter=NO
-endif
+# endif
#
# Building various ways?
# -O is pretty desirable, otherwise no inlining of prelude
# things (incl "+") happens when compiling with this compiler
-GhcLibHcOpts=-O
+GhcLibHcOpts=-O -Rghc-timing
# Win32 only: Enable the RTS and libraries to be built as DLLs
# Don't split object files for libs if we're building DLLs
GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/
UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/
-STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
HP2PS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/
-
+HSC2HS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
#-----------------------------------------------------------------------------
# Haskell compilers and mkdependHS
NHC = @NHC@
HC = @WithHc@
-MKDEPENDHS = $(HC)
+MKDEPENDHS = $(GHC)
# Sometimes we want to invoke ghc from the build tree in different
# projects (eg. it's handy to have a nofib & a ghc build in the same
#
INSTALL := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
LATEX = latex
-LATEX2HTML = hevea
+HEVEA = hevea
+HACHA = hacha
LN_S = @LN_S@
MANMACROS = -man
MSMACROS = -ms
# Stuff from fptools/ghc/utils
#
UNLIT = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-STAT2RESID = $(STAT2RESID_PREFIX)stat2resid
HP2PS = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
-HSCPP = $(HSCPP_PREFIX)hscpp
HSTAGS = $(HSTAGS_PREFIX)hstags
+HSC2HS = $(HSC2HS_PREFIX)hsc2hs-inplace
#
# Options for the compiling different `ways'. Various projects within