X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=275de627be431c43754ba195598adef5048e8e57;hb=7cc35327fd1acde88f3474d4e4727f8d8185ff67;hp=c511eebcdf8ec4cc0366a7ab94fcb8551404cc3c;hpb=cdaa0b92ff96813b16fc351934d63080c05dece1;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index c511eeb..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
 
@@ -165,6 +154,10 @@ endif
 # profiling enabled (GhcProfiled = YES).
 ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
 CONFIGURE_FLAGS_STAGE2 += --enable-library-profiling
+# And if we're profiling GHC then we want lots of SCCs
+ifeq "$(GhcProfiled)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --ghc-option=-auto-all
+endif
 endif
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"