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

diff --git a/compiler/Makefile b/compiler/Makefile
index 67d4e3f..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
 
@@ -150,7 +139,7 @@ COMMON_CONFIGURE_FLAGS += --ghc-option=-DOMIT_NATIVE_CODEGEN
 endif
 
 ifeq "$(TargetOS_CPP)" "openbsd"
-COMMON_CONFIGURE_FLAGS += --ld-options="-Xlinker -E"
+COMMON_CONFIGURE_FLAGS += --ld-options=-E
 endif
 
 ifeq "$(GhcUnregisterised)" "NO"
@@ -160,6 +149,17 @@ COMMON_CONFIGURE_FLAGS += --ld-option=-Wl,--relax
 endif
 endif
 
+# We need to turn on profiling either if we have been asked to
+# (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
+# 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"
 # The #include is vital for the via-C route with older compilers, else the C
 # compiler doesn't realise that the stcall foreign imports are indeed
@@ -199,7 +199,9 @@ build.stage.%:
 	$(MAKE) -C ../ghc stage=$*
 
 doc.stage.%:
-	$(CABAL) haddock --distpref dist-stage$*
+	$(CABAL) haddock --distpref dist-stage$* \
+	                 --haddock-option=--optghc=-DSTAGE=$* \
+	                 --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
 # XXX We ought to actually install the (stage 2) library
 install:
@@ -450,6 +452,9 @@ primop-primop-info.hs-incl: prelude/primops.txt
 primop-usage.hs-incl: prelude/primops.txt
 	$(GENPRIMOP) --usage              < $< > $@
 
+html:
+	$(MAKE) doc stage=2
+
 install-docs:
 	@: