X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=67d4e3f774fd1cb4e1d0ab8e681d344dad8ba11a;hb=fc9bbbab3fe56cf0ff5723abbdb0f496d257f34e;hp=dbc472596b5b4d371d8eea6b0e304838039e2a49;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index dbc4725..67d4e3f 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -40,7 +40,11 @@ PRIMOP_BITS = primop-data-decl.hs-incl \ primop-strictness.hs-incl \ primop-primop-info.hs-incl -all:: build.stage$(stage) +boot:: boot.stage.$(stage) + +all:: build.stage.$(stage) + +doc:: doc.stage.$(stage) stage1 :: $(MAKE) stage=1 @@ -51,24 +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 @@ -117,20 +146,17 @@ endif ifeq "$(GhcWithNativeCodeGen)" "NO" # XXX This should logically be a CPP option, but there doesn't seem to # be a flag for that -CONFIGURE_FLAGS_STAGE1 += --ghc-option=-DOMIT_NATIVE_CODEGEN -CONFIGURE_FLAGS_STAGE2 += --ghc-option=-DOMIT_NATIVE_CODEGEN +COMMON_CONFIGURE_FLAGS += --ghc-option=-DOMIT_NATIVE_CODEGEN endif ifeq "$(TargetOS_CPP)" "openbsd" -CONFIGURE_FLAGS_STAGE1 += --ld-options="-Xlinker -E" -CONFIGURE_FLAGS_STAGE2 += --ld-options="-Xlinker -E" +COMMON_CONFIGURE_FLAGS += --ld-options="-Xlinker -E" endif ifeq "$(GhcUnregisterised)" "NO" ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux" # needed for generating proper relocation in large binaries: trac #856 -CONFIGURE_FLAGS_STAGE1 += --ld-option=-Wl,--relax -CONFIGURE_FLAGS_STAGE2 += --ld-option=-Wl,--relax +COMMON_CONFIGURE_FLAGS += --ld-option=-Wl,--relax endif endif @@ -140,7 +166,10 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" # stdcall, and doesn't generate the Foo@8 name for them # As it's only important for older compilers we don't need to do anything # for stage2+. -CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include -\#include ' +CONFIGURE_FLAGS_STAGE1 += --ghc-option='-\#include' \ + --ghc-option='""' \ + --ghc-option='-\#include' \ + --ghc-option='""' endif # ghc_strlen percolates through so many modules that it is easier to get its @@ -149,37 +178,32 @@ endif # stage 2+. CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include "cutils.h"' -build.stage1: $(PRIMOP_BITS) - $(CABAL) configure --distpref dist-stage1 \ - $(CONFIGURE_FLAGS_STAGE1) \ - $(INSTALL_DIRS_CONFIGURE_FLAGS) \ - $(USE_BOOT_CONFIGURE_FLAGS) \ - $(COMMON_CONFIGURE_FLAGS) \ - --flags=-ghci \ - --flags=stage1 \ - --ghc-option=-DSTAGE=1 - $(RM) -f Makefile-stage1 - $(CABAL) makefile --distpref dist-stage1 -f Makefile-stage1 - $(MAKE) -f Makefile-stage1 stage=1 - $(CABAL) register --distpref dist-stage1 --inplace - -build.stage2: $(PRIMOP_BITS) - $(CABAL) configure --distpref dist-stage2 \ - $(CONFIGURE_FLAGS_STAGE2) \ +CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2) +CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS) +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) \ - $(USE_STAGE1_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \ - --flags=-stage1 \ - --ghc-option=-DSTAGE=2 - $(RM) -f Makefile-stage2 - $(CABAL) makefile --distpref dist-stage2 -f Makefile-stage2 - $(MAKE) -f Makefile-stage2 stage=2 - $(CABAL) register --distpref dist-stage2 --inplace + --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$* -boot :: stage_dirs +# XXX We ought to actually install the (stage 2) library +install: + @: # ----------------------------------------------------------------------------- # Create compiler configuration @@ -187,8 +211,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) - $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @$(RM) -f $(CONFIG_HS) @echo "Creating $(CONFIG_HS) ... " @@ -293,7 +315,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__" >$@ @@ -339,7 +362,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__" >$@ @@ -382,7 +406,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) @@ -422,25 +450,13 @@ primop-primop-info.hs-incl: prelude/primops.txt primop-usage.hs-incl: prelude/primops.txt $(GENPRIMOP) --usage < $< > $@ -# XXX: +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)