projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d0b244f
)
Don't build ghc in stage1 with editline (since we already don't build ghci). Fixes...
author
Judah Jacobson
<judah.jacobson@gmail.com>
Sat, 30 Aug 2008 21:14:29 +0000
(21:14 +0000)
committer
Judah Jacobson
<judah.jacobson@gmail.com>
Sat, 30 Aug 2008 21:14:29 +0000
(21:14 +0000)
compiler/Makefile
patch
|
blob
|
history
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
03f9c1e
..
3b184ee
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-116,8
+116,7
@@
ifeq "$(GhciWithDebugger)" "YES"
CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DDEBUGGER
endif
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
# - 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
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
CONFIGURE_FLAGS_STAGE1 += --flags=-editline
-endif
ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
CONFIGURE_FLAGS_STAGE2 += --flags=editline
else
ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
CONFIGURE_FLAGS_STAGE2 += --flags=editline
else