diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-11-09 10:17:53 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-11-09 10:17:53 +0000 |
| commit | 27218ba74f28c527e0b3e88195169b6949d98899 (patch) | |
| tree | 2419ef6ded31dcb6e73b5019665257c31a71a94b | |
| parent | fb0318e2bbe527464ed6d19cc292121fe88b2636 (diff) | |
| download | haskell-27218ba74f28c527e0b3e88195169b6949d98899.tar.gz | |
use the right $(HC) for stage 3
| -rw-r--r-- | compiler/Makefile | 3 | ||||
| -rw-r--r-- | mk/package.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index c77dc5f5cf..6c83f9cd8c 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 e2058f799c..e89256608f 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)" "" |