From d17afd1e4aa5c7a0992e5ac5b2cda325992706a8 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Fri, 21 Jan 2011 23:05:52 +0000
Subject: [PATCH] Manually control more of the Cabal flags for the compiler
 and ghc packages For some reason the Windows HEAD builder
 has started thinking the ghci flag should be on in stage 1.
 This should fix it, and generally make things a little more
 resilient.

---
 compiler/ghc.cabal.in |    3 +++
 ghc/ghc-bin.cabal.in  |    2 ++
 ghc/ghc.mk            |    8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 01db24a..dd9dd64 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -44,14 +44,17 @@ Flag ncg
 Flag stage1
     Description: Is this stage 1?
     Default: False
+    Manual: True
 
 Flag stage2
     Description: Is this stage 2?
     Default: False
+    Manual: True
 
 Flag stage3
     Description: Is this stage 3?
     Default: False
+    Manual: True
 
 Library
     Exposed: False
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 6481180..420c918 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -20,6 +20,8 @@ Cabal-Version: >= 1.2
 
 Flag ghci
     Description: Build GHCi support.
+    Default: False
+    Manual: True
 
 Executable ghc
     Main-Is: Main.hs
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index d0c5ce8..e6383e1 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -14,6 +14,14 @@
 ghc_USES_CABAL = YES
 ghc_PACKAGE = ghc-bin
 
+ghc_stage1_CONFIGURE_OPTS += --flags=stage1
+ghc_stage2_CONFIGURE_OPTS += --flags=stage2
+ghc_stage3_CONFIGURE_OPTS += --flags=stage3
+
+ifeq "$(GhcWithInterpreter)" "YES"
+ghc_stage2_CONFIGURE_OPTS += --flags=ghci
+endif
+
 ghc_stage1_MORE_HC_OPTS = $(GhcStage1HcOpts)
 ghc_stage2_MORE_HC_OPTS = $(GhcStage2HcOpts)
 ghc_stage3_MORE_HC_OPTS = $(GhcStage3HcOpts)
-- 
1.7.10.4