X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=3b12f7c019f761a8660fa6f024b579aa6671af54;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=9d1a2d9dff8c94421b410b2b9ec6af913b83b027;hpb=85f096f8051d4a5c20ac36c1b8866007ad4146c3;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 9d1a2d9..3b12f7c 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -439,13 +439,19 @@ compiler_stage1_SplitObjs = NO
 compiler_stage2_SplitObjs = NO
 compiler_stage3_SplitObjs = NO
 
+# If we "make 1" or "make 2" then we don't want the rules for the stage
+# that we haven't been asked to build
 ifeq "$(stage)" "1"
 compiler_stage2_NOT_NEEDED = YES
 endif
+ifeq "$(stage)" "2"
+compiler_stage1_NOT_NEEDED = YES
+endif
+# We don't want the rules for stage3 unless we have been explicitly
+# asked to build it
 ifneq "$(stage)" "3"
 compiler_stage3_NOT_NEEDED = YES
 endif
-
 $(eval $(call build-package,compiler,stage1,0))
 $(eval $(call build-package,compiler,stage2,1))
 $(eval $(call build-package,compiler,stage3,2))
@@ -474,6 +480,13 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
 compiler/main/Constants_HC_OPTS  += -fforce-recomp
 
+# Workaround for #4003 in GHC 6.12.2.  It didn't happen in 6.12.1, and
+# will be fixed in 6.12.3.  Unfortunately we don't have a way to do
+# this for just stage1 in the build system.
+ifeq "$(GhcVersion)" "6.12.2"
+compiler/hsSyn/HsLit_HC_OPTS     += -fomit-interface-pragmas
+endif
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.