From 27218ba74f28c527e0b3e88195169b6949d98899 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 9 Nov 2006 10:17:53 +0000 Subject: [PATCH] use the right $(HC) for stage 3 --- compiler/Makefile | 3 +++ mk/package.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/compiler/Makefile b/compiler/Makefile index c77dc5f..6c83f9c 100644 --- 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 --- 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)" "" -- 1.7.10.4