From a999a72ed635ca95806b4fe3e15fa2b1a6fea967 Mon Sep 17 00:00:00 2001 From: Judah Jacobson Date: Sat, 30 Aug 2008 21:14:29 +0000 Subject: [PATCH] Don't build ghc in stage1 with editline (since we already don't build ghci). Fixes #2557. --- compiler/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 03f9c1e..3b184ee 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -116,8 +116,7 @@ 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 @@ -127,11 +126,7 @@ 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 ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" "" CONFIGURE_FLAGS_STAGE2 += --flags=editline else -- 1.7.10.4