Commit d17afd1e authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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.
parent 2e9fee40
...@@ -44,14 +44,17 @@ Flag ncg ...@@ -44,14 +44,17 @@ Flag ncg
Flag stage1 Flag stage1
Description: Is this stage 1? Description: Is this stage 1?
Default: False Default: False
Manual: True
Flag stage2 Flag stage2
Description: Is this stage 2? Description: Is this stage 2?
Default: False Default: False
Manual: True
Flag stage3 Flag stage3
Description: Is this stage 3? Description: Is this stage 3?
Default: False Default: False
Manual: True
Library Library
Exposed: False Exposed: False
......
...@@ -20,6 +20,8 @@ Cabal-Version: >= 1.2 ...@@ -20,6 +20,8 @@ Cabal-Version: >= 1.2
Flag ghci Flag ghci
Description: Build GHCi support. Description: Build GHCi support.
Default: False
Manual: True
Executable ghc Executable ghc
Main-Is: Main.hs Main-Is: Main.hs
......
...@@ -14,6 +14,14 @@ ...@@ -14,6 +14,14 @@
ghc_USES_CABAL = YES ghc_USES_CABAL = YES
ghc_PACKAGE = ghc-bin 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_stage1_MORE_HC_OPTS = $(GhcStage1HcOpts)
ghc_stage2_MORE_HC_OPTS = $(GhcStage2HcOpts) ghc_stage2_MORE_HC_OPTS = $(GhcStage2HcOpts)
ghc_stage3_MORE_HC_OPTS = $(GhcStage3HcOpts) ghc_stage3_MORE_HC_OPTS = $(GhcStage3HcOpts)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment