From 2febde47a9d53c141fedb9e56bc59ce739c96dce Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 13 May 2010 14:20:17 +0000 Subject: [PATCH] Undo part of #4003 patch We still need the workaround for when compiling HEAD with 6.12.2 --- compiler/ghc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 827ffb4..3b12f7c 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -480,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. -- 1.7.10.4