X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=275de627be431c43754ba195598adef5048e8e57;hb=19f903bc5210e0cccfafbebdc46ed6e1743991ba;hp=03f9c1e6190d065fc76f1481322541df15481a7c;hpb=d0b244f7d8c061112633a29f821a479c2355c405;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 03f9c1e..275de62 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -116,26 +116,15 @@ ifeq "$(GhciWithDebugger)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DDEBUGGER
 endif
 
-# Enable editline if either:
-#   - we're building stage 1 and $(GhcHasEditline)="YES"
+# Enable editline if:
 #   - we're building stage 2/3, and we have built the editline package
 #
 # 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
-ifeq "$(GhcHasEditline)" "YES"
-CONFIGURE_FLAGS_STAGE1 += --flags=editline
-else
-CONFIGURE_FLAGS_STAGE1 += --flags=-editline
-endif
+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