From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 15 Oct 2009 11:51:20 +0000 (+0000)
Subject: Add some manual dependencies, and -fforce-recomp for Constants and PrimOps
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=f031f894049111ff14d35b3e1c2dc6c97a31f1a8

Add some manual dependencies, and -fforce-recomp for Constants and PrimOps
GHC's recompilation checker doesn't take into account #included files,
which is really a bug.  We work around it here by adding dependencies
and using -fforce-recomp in a couple of places.
---

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 6f78192..86f91a9 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -460,11 +460,16 @@ $(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(inclu
 $(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS)
 
 # Every Constants.o object file depends on includes/GHCConstants.h:
-$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS)))
+$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS) includes/HaskellConstants.hs))
 
 # Every PrimOp.o object file depends on $(PRIMOP_BITS):
 $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 
+# GHC itself doesn't know about the above dependencies, so we have to
+# switch off the recompilation checker for those modules:
+compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
+compiler/main/Constants_HC_OPTS  += -fforce-recomp
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.