[project @ 1999-12-08 10:10:59 by simonmar]

New make variable: $(WithNofibHc) which defines the Haskell compiler
used to build nofib.

Define $(GHC_INPLACE) in fptools/mk/config.mk.in.  $(WithNofibHc) is
set to $(GHC_INPLACE) by default.

Fix $(MKDEPENDHS) in ghc/lib/std/Makefile.

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index d109fba..491d87d 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -18,12 +18,13 @@ else
 SUBDIRS=
 endif
 
-HC = $(GHC_INPLACE)
-
 #-----------------------------------------------------------------------------
 #      Setting the standard variables
 #
 
+HC        = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f9bddb8..2c3a292 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -312,6 +312,7 @@ HappyHcOpts = -O
 #
 ################################################################################
 
+WithNofibHc = $(GHC_INPLACE)
 
 # NoFibSubDirs controls which set of tests should be run
 # You can run one or more of
@@ -504,6 +505,12 @@ NHC                = @NHC@
 HC             = @WithHc@
 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
+# tree).  We can refer to "this ghc" as $(GHC_INPLACE):
+
+GHC_INPLACE    = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
+
 #-----------------------------------------------------------------------------
 # C compiler
 #