X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=5598be659004381071fcc5525ed58e6b08425b2d;hb=8c2fd74094dc533bf3256158325e3f091e57e5d2;hp=129adfc4d54bd5d70a93c5746a312fd37671ff2e;hpb=f893fb935d23418b80534b05f35fe50d54af0acc;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 129adfc..5598be6 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -44,6 +44,8 @@ boot:: boot.stage.$(stage)
 
 all:: build.stage.$(stage)
 
+doc:: doc.stage.$(stage)
+
 stage1 ::
 	$(MAKE) stage=1
 
@@ -56,12 +58,16 @@ stage3 ::
 clean distclean::
 	-$(CABAL) clean --distpref dist-stage1
 	-$(CABAL) clean --distpref dist-stage2
+	-$(CABAL) clean --distpref dist-stage3
 	$(RM) -f Makefile-stage1
 	$(RM) -f Makefile-stage2
+	$(RM) -f Makefile-stage3
 	$(RM) -f prelude/primops.txt
 	$(RM) -f $(PRIMOP_BITS)
 	$(RM) -f $(CONFIG_HS)
 	$(RM) -f parser/Parser.y
+	$(RM) -rf stage1 stage2plus
+	$(RM) -f $(STAGE3_PACKAGE_CONF)
 
 CONFIGURE_FLAGS_STAGE1 += --flags=stage1
 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
@@ -71,12 +77,13 @@ CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 ifeq "$(GhcWithInterpreter)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --flags=ghci
 
+ifeq "$(BuildSharedLibs)" "YES"
+CONFIGURE_FLAGS_STAGE2 += --enable-shared
 # If we are going to use dynamic libraries instead of .o files for ghci,
 # we will need to always retain CAFs in the compiler.
 # ghci/keepCAFsForGHCi contains a GNU C __attribute__((constructor))
 # function which sets the keepCAFs flag for the RTS before any Haskell
 # code is run.
-ifeq "$(GhcBuildDylibs)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs
 else
 CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs
@@ -163,6 +170,7 @@ CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
 boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
+	test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
 	$(CABAL) configure --distpref dist-stage$* \
 	                   $(CONFIGURE_FLAGS_STAGE$*) \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -175,15 +183,13 @@ build.stage.%:
 	$(MAKE) -f Makefile-stage$* stage=$*
 	$(CABAL) register  --distpref dist-stage$* --inplace
 
+doc.stage.%:
+	$(CABAL) haddock --distpref dist-stage$*
+
 # XXX We ought to actually install the (stage 2) library
 install:
 	@:
 
-stage_dirs :
-	$(MKDIRHIER) stage$(stage)
-
-boot :: stage_dirs
-
 # -----------------------------------------------------------------------------
 # Create compiler configuration
 #
@@ -294,7 +300,8 @@ endif
 
 PLATFORM_H = ghc_boot_platform.h
 
-stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage1/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+	$(MKDIRHIER) stage1
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -340,7 +347,8 @@ endif
 # For stage2 and above, the BUILD platform is the HOST of stage1, and
 # the HOST platform is the TARGET of stage1.  The TARGET remains the same
 # (stage1 is the cross-compiler, not stage2).
-stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage2plus/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+	$(MKDIRHIER) stage2plus
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -383,7 +391,11 @@ endif
 	@echo "#endif /* __PLATFORM_H__ */"          >> $@
 	@echo "Done."
 
-STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H)
+ifeq "$(stage)" "1"
+STAGE_PLATFORM_H = stage1/$(PLATFORM_H)
+else
+STAGE_PLATFORM_H = stage2plus/$(PLATFORM_H)
+endif
 
 boot :: $(STAGE_PLATFORM_H)