summaryrefslogtreecommitdiff
path: root/ghc/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-17 11:41:32 +0000
committerIan Lynagh <igloo@earth.li>2008-08-17 11:41:32 +0000
commitcf690bef85f23a001d110daad26b11057f58d8fc (patch)
tree533b8568f5e64cc8378fa6335ea9857610737157 /ghc/Makefile
parent9520de572cb08531b67b07569bd30c3ed27d9f94 (diff)
downloadhaskell-cf690bef85f23a001d110daad26b11057f58d8fc.tar.gz
Don't do the stage1 re-linking hack if we have GHC >= 6.9
Diffstat (limited to 'ghc/Makefile')
-rw-r--r--ghc/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/ghc/Makefile b/ghc/Makefile
index 3035b43303..5eff4daea8 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -82,10 +82,12 @@ BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
# no library to register
ifeq "$(stage)" "1"
+ifeq "$(ghc_ge_609)" "NO"
# GHC 6.9+ can handle cross-package recompilation checking, but
# we don't rely on the bootstrapping compiler being able to do this.
TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
endif
+endif
boot.stage.%:
$(CABAL) configure --distpref dist-stage$* \