Commit cf690bef authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Don't do the stage1 re-linking hack if we have GHC >= 6.9

parent 9520de57
...@@ -82,10 +82,12 @@ BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS)) ...@@ -82,10 +82,12 @@ BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
# no library to register # no library to register
ifeq "$(stage)" "1" ifeq "$(stage)" "1"
ifeq "$(ghc_ge_609)" "NO"
# GHC 6.9+ can handle cross-package recompilation checking, but # GHC 6.9+ can handle cross-package recompilation checking, but
# we don't rely on the bootstrapping compiler being able to do this. # we don't rely on the bootstrapping compiler being able to do this.
TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
endif endif
endif
boot.stage.%: boot.stage.%:
$(CABAL) configure --distpref dist-stage$* \ $(CABAL) configure --distpref dist-stage$* \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment