[commit: ghc] master: Add a kludgy dependency to fix compiling modules that use annotations (eeccce1)

Ian Lynagh igloo at earth.li
Sun Mar 17 21:41:45 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/eeccce144dfd6619c85dfb641988da4614c2221c

>---------------------------------------------------------------

commit eeccce144dfd6619c85dfb641988da4614c2221c
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 17 17:23:10 2013 +0000

    Add a kludgy dependency to fix compiling modules that use annotations
    
    We now make the stage 2 compiler depend on GHC.Desugar.

>---------------------------------------------------------------

 ghc/ghc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 44dd126..a5c7801 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





More information about the ghc-commits mailing list