summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-17 17:23:10 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-17 17:23:10 +0000
commiteeccce144dfd6619c85dfb641988da4614c2221c (patch)
treeeda6b90f753b4c83188c771a98f0fce4ab55ea37 /ghc
parent24be4bcbb9d9b44efeb3f956fd65c8b07e80ca97 (diff)
downloadhaskell-eeccce144dfd6619c85dfb641988da4614c2221c.tar.gz
Add a kludgy dependency to fix compiling modules that use annotations
We now make the stage 2 compiler depend on GHC.Desugar.
Diffstat (limited to 'ghc')
-rw-r--r--ghc/ghc.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 44dd126d37..a5c7801863 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -161,6 +161,12 @@ $(GHC_STAGE2) : | $$(touchy_INPLACE)
$(GHC_STAGE3) : | $$(touchy_INPLACE)
endif
+# Modules like vector:Data.Vector.Fusion.Stream.Monadic use annotations,
+# which means they depend on GHC.Desugar. To ensure that This module is
+# available by the time it is needed, we make the stage 2 compiler
+# depend on it.
+$(GHC_STAGE2) : $(foreach w,$(GhcLibWays),libraries/base/dist-install/build/GHC/Desugar.$($w_osuf))
+
endif
INSTALL_LIBS += settings