Make the dynlibs, ghci and ncg flags manual too

diff --git a/compiler/Makefile b/compiler/Makefile
index 275de62..65207c7 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -78,14 +78,9 @@ clean.stage.%:
 CONFIGURE_FLAGS_STAGE1 += --flags=stage1
 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
 
-CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
-
 ifeq "$(GhcWithNativeCodeGen)" "YES"
 CONFIGURE_FLAGS_STAGE1 += --flags=ncg
 CONFIGURE_FLAGS_STAGE2 += --flags=ncg
-else
-CONFIGURE_FLAGS_STAGE1 += --flags=-ncg
-CONFIGURE_FLAGS_STAGE2 += --flags=-ncg
 endif
 
 ifeq "$(GhcWithInterpreter)" "YES"
@@ -99,8 +94,6 @@ CONFIGURE_FLAGS_STAGE2 += --enable-shared
 # function which sets the keepCAFs flag for the RTS before any Haskell
 # code is run.
 CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs
-else
-CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs
 endif
 
 ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
@@ -127,9 +120,6 @@ ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
 CONFIGURE_FLAGS_STAGE2 += --flags=editline
 endif
 endif
-
-else
-CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
 endif
 
 ifeq "$(GhcWithNativeCodeGen)" "NO"

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 6b54eeb..a08f518 100644 (file)
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -22,6 +22,8 @@ Flag base3
 
 Flag dynlibs
     Description: Dynamic library support
+    Default: False
+    Manual: True
 
 Flag editline
     Description: Use editline
@@ -30,9 +32,13 @@ Flag editline
 
 Flag ghci
     Description: Build GHCi support.
+    Default: False
+    Manual: True
 
 Flag ncg
     Description: Build the NCG.
+    Default: False
+    Manual: True
 
 Flag stage1
     Description: Is this stage 1?