diff options
| author | Judah Jacobson <judah.jacobson@gmail.com> | 2008-08-30 21:14:29 +0000 |
|---|---|---|
| committer | Judah Jacobson <judah.jacobson@gmail.com> | 2008-08-30 21:14:29 +0000 |
| commit | a999a72ed635ca95806b4fe3e15fa2b1a6fea967 (patch) | |
| tree | 74b9d198fc1e1530a707b7f7f4237a45518a1aab /compiler/Makefile | |
| parent | d0b244f7d8c061112633a29f821a479c2355c405 (diff) | |
| download | haskell-a999a72ed635ca95806b4fe3e15fa2b1a6fea967.tar.gz | |
Don't build ghc in stage1 with editline (since we already don't build ghci). Fixes #2557.
Diffstat (limited to 'compiler/Makefile')
| -rw-r--r-- | compiler/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index 03f9c1e619..3b184ee5c1 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 |