X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=026e54da663de1cdd8e41c66a524f875df3fc59c;hb=c0d02c08259a36d83d5597c87196f5b03caf81dc;hp=3e2ae8d988eb4de7788280da3a97e4c684af9ff2;hpb=5b9164b417bd96a629adb0998796e2f9d2d5d22f;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 3e2ae8d..026e54d 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -40,8 +40,12 @@ PRIMOP_BITS = primop-data-decl.hs-incl \ primop-strictness.hs-incl \ primop-primop-info.hs-incl +boot:: boot.stage.$(stage) + all:: build.stage.$(stage) +doc:: doc.stage.$(stage) + stage1 :: $(MAKE) stage=1 @@ -51,30 +55,49 @@ stage2 :: stage3 :: $(MAKE) stage=3 +ifeq "$(CLEAN_ALL_STAGES)" "YES" clean distclean:: - -$(CABAL) clean --distpref dist-stage1 - -$(CABAL) clean --distpref dist-stage2 - $(RM) -f Makefile-stage1 - $(RM) -f Makefile-stage2 $(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) +endif + +ifeq "$(CLEAN_ALL_STAGES)" "YES" +clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3 +else +clean distclean:: clean.stage.$(stage) +endif + +clean.stage.%: + -$(CABAL) clean --distpref dist-stage$* + $(RM) -f Makefile-stage$* CONFIGURE_FLAGS_STAGE1 += --flags=stage1 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci +ifeq "$(GhcWithNativeCodeGen)" "YES" +CONFIGURE_FLAGS_STAGE1 += --flags=ncg +CONFIGURE_FLAGS_STAGE2 += --flags=ncg +else +CONFIGURE_FLAGS_STAGE1 += --flags=-ncg +CONFIGURE_FLAGS_STAGE2 += --flags=-ncg +endif + 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 @@ -127,7 +150,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,7 +183,8 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS) -build.stage.%: $(PRIMOP_BITS) +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) \ @@ -168,13 +192,20 @@ build.stage.%: $(PRIMOP_BITS) --ghc-option=-DSTAGE=$* $(RM) -f Makefile-stage$* $(CABAL) makefile --distpref dist-stage$* -f Makefile-stage$* + +build.stage.%: $(MAKE) -f Makefile-stage$* stage=$* $(CABAL) register --distpref dist-stage$* --inplace + $(MAKE) -C ../ghc stage=$* -stage_dirs : - $(MKDIRHIER) stage$(stage) +doc.stage.%: + $(CABAL) haddock --distpref dist-stage$* \ + --haddock-option=--optghc=-DSTAGE=$* \ + --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock -boot :: stage_dirs +# XXX We ought to actually install the (stage 2) library +install: + @: # ----------------------------------------------------------------------------- # Create compiler configuration @@ -182,10 +213,6 @@ boot :: stage_dirs # The 'echo' commands simply spit the values of various make variables # into Config.hs, whence they can be compiled and used by GHC itself -boot :: $(CONFIG_HS) - -boot :: parser/Parser.y - $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @$(RM) -f $(CONFIG_HS) @echo "Creating $(CONFIG_HS) ... " @@ -290,7 +317,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__" >$@ @@ -336,7 +364,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__" >$@ @@ -379,7 +408,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) @@ -419,25 +452,16 @@ primop-primop-info.hs-incl: prelude/primops.txt primop-usage.hs-incl: prelude/primops.txt $(GENPRIMOP) --usage < $< > $@ -# XXX: +html: + $(MAKE) doc stage=2 + +install-docs: + @: + #----------------------------------------------------------------------------- # binary-dist # -#binary-dist: -# $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler -# $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage) -# echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile -# cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile -# $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/ -# set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done -# set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done -#ifneq "$(INSTALL_LIBS)" "" -# set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done -#endif -#ifneq "$(INSTALL_PROGS)" "" -# set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done -#endif -#ifneq "$(INSTALL_LIBEXECS)" "" -# set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done -#endif + +include $(TOP)/mk/bindist.mk +LIB_DIST_DIR = dist-stage$(stage)