[project @ 2000-10-03 09:56:58 by rrt]

Add $(FPTOOLS_TOP)/dll to PATH when running GHC_INPLACE. This is to make the
inplace compiler pick up the right set of DLLs under Windows, and won't have
any effect on other platforms (where the dll directory is empty).

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3dcfcc0..fc7908c 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -529,9 +529,11 @@ MKDEPENDHS = $(HC)
 
 # 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):
+# tree).  We can refer to "this ghc" as $(GHC_INPLACE).
+# The addition to PATH makes the inplace GHC pick up the right
+# DLLs under Windows; it won't have any effect on other platforms.
 
-GHC_INPLACE    = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
+GHC_INPLACE    = PATH=$(FPTOOLS_TOP)/dll:$$PATH $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
 
 #-----------------------------------------------------------------------------
 # C compiler