From cf690bef85f23a001d110daad26b11057f58d8fc Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 17 Aug 2008 11:41:32 +0000 Subject: [PATCH] Don't do the stage1 re-linking hack if we have GHC >= 6.9 --- ghc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ghc/Makefile b/ghc/Makefile index 3035b43..5eff4da 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$* \ -- 1.7.10.4