[project @ 1999-12-09 14:40:07 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f9bddb8..760e7dd 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -147,7 +147,7 @@ IncludeTestDirsInBuild=NO
 #                           HC_ROJEMO_NHC
 #                           HC_UNSPECIFIED
 
-WithGhcHc = $(HC)
+WithGhcHc = @WithHc@
 
 # Variable which is set to the version number of the $(WithGhcHc) we're using.
 # Not currently used, but might come in handy sometime soon.
@@ -281,7 +281,7 @@ HaveLibReadline=@HaveLibReadline@
 ################################################################################
 
 # The compiler you'd like to use to compile Happy
-WithHappyHc = $(HC)
+WithHappyHc = @WithHc@
 
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
 #            to compile the Happy sources with.
@@ -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
@@ -501,9 +502,15 @@ GHC                = @GHC@
 HBC            = @HBC@
 NHC            = @NHC@
 
-HC             = @WithHc@
+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
 #