From: Ian Lynagh <igloo@earth.li>
Date: Sun, 31 Aug 2008 15:21:03 +0000 (+0000)
Subject: Make ghc.cabal's editline flag manual, to simplify the Makefile
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=19f903bc5210e0cccfafbebdc46ed6e1743991ba

Make ghc.cabal's editline flag manual, to simplify the Makefile
---

diff --git a/compiler/Makefile b/compiler/Makefile
index 3b184ee..275de62 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -122,15 +122,9 @@ endif
 # But we don't enable editline on Windows, as Windows terminals have
 # editline-like support builtin.
 #
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-CONFIGURE_FLAGS_STAGE1 += --flags=-editline
-CONFIGURE_FLAGS_STAGE2 += --flags=-editline
-else
-CONFIGURE_FLAGS_STAGE1 += --flags=-editline
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
 CONFIGURE_FLAGS_STAGE2 += --flags=editline
-else
-CONFIGURE_FLAGS_STAGE2 += --flags=-editline
 endif
 endif
 
diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 3c49019..6b54eeb 100644
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -25,6 +25,8 @@ Flag dynlibs
 
 Flag editline
     Description: Use editline
+    Default: False
+    Manual: True
 
 Flag ghci
     Description: Build GHCi support.