use the right $(HC) for stage 3

diff --git a/compiler/Makefile b/compiler/Makefile
index c77dc5f..6c83f9c 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -858,6 +858,9 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
 # Haddock can't handle recursive modules currently, so we disable it for now.
 NO_HADDOCK_DOCS = YES
 
+# Tell package.mk not to set $(HC)
+NO_SET_HC = YES
+
 # The stage 2 GHC binary itself is built by  compiling main/Main.hs 
 # (the same as used in stage 1) against the GHC package.
 #

diff --git a/mk/package.mk b/mk/package.mk
index e2058f7..e892566 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -141,7 +141,9 @@ endif # $(way) == ""
 
 SRC_HSC2HS_OPTS += -I.
 
+ifneq "$(NO_SET_HC)" "YES"
 HC = $(GHC_INPLACE)
+endif
 IGNORE_PACKAGE_FLAG = -package-name  $(PACKAGE)-$(VERSION)
 
 ifeq "$(NON_HS_PACKAGE)" ""