projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85f096f
)
workaround for #4003, fixes HEAD build with 6.12.2
author
Simon Marlow
<marlowsd@gmail.com>
Mon, 26 Apr 2010 10:34:28 +0000
(10:34 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Mon, 26 Apr 2010 10:34:28 +0000
(10:34 +0000)
compiler/ghc.mk
patch
|
blob
|
history
diff --git
a/compiler/ghc.mk
b/compiler/ghc.mk
index
9d1a2d9
..
ef662f6
100644
(file)
--- a/
compiler/ghc.mk
+++ b/
compiler/ghc.mk
@@
-474,6
+474,13
@@
$(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
compiler/main/Constants_HC_OPTS += -fforce-recomp
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.
# Note [munge-stage1-package-config]
# Strip the date/patchlevel from the version of stage1. See Note
# [fiddle-stage1-version] above.