diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-05-13 14:20:17 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-05-13 14:20:17 +0000 |
| commit | 2febde47a9d53c141fedb9e56bc59ce739c96dce (patch) | |
| tree | 309e01f45ae688cff57a919200ecfb5d5d41003f /compiler | |
| parent | 20816fa80a9c4532099da6650817aabf1f5b5630 (diff) | |
| download | haskell-2febde47a9d53c141fedb9e56bc59ce739c96dce.tar.gz | |
Undo part of #4003 patch
We still need the workaround for when compiling HEAD with 6.12.2
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 827ffb47fc..3b12f7c019 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. |