aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-02-13 18:50:28 +0000
committerIan Lynagh <igloo@earth.li>2009-02-13 18:50:28 +0000
commitf83abdb15139627b4e93fb5651b62bf136f8794e (patch)
treeae91aa0f4c8953efe68e728868d76b259fe1cc39
parent73dcc6cffa965c0e674090753adaf0e4ff9cedcc (diff)
do .depend generation for haddock with the stage1 compiler
This is a bit of a hack. We mkdepend with stage1 as if .depend depends on the stage2 compiler then make goes wrong: haddock's .depend gets included, which means that make won't reload until it's built, but we can't build it without the stage2 compiler. We therefore build the stage2 compiler before its .depend file is available, and so compilation fails.
-rw-r--r--ghc.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/ghc.mk b/ghc.mk
index 67cde764..5a51ecae 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -3,6 +3,13 @@ utils/haddock_USES_CABAL = YES
utils/haddock_PACKAGE = haddock
utils/haddock_CONFIGURE_OPTS = --flag in-ghc-tree
utils/haddock_dist_PROG = haddock
+# XXX This is a bit of a hack. We mkdepend with stage1 as if .depend
+# depends on the stage2 compiler then make goes wrong: haddock's
+# .depend gets included, which means that make won't reload until
+# it's built, but we can't build it without the stage2 compiler. We
+# therefore build the stage2 compiler before its .depend file is
+# available, and so compilation fails.
+utils/haddock_dist_HC_DEP = $(GHC_STAGE1)
# XXX This is a temporary hack:
utils/haddock_HC_OPTS += -Wwarn