X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=7ca001a3ed2d0c6049398a0867916615065f8c8d;hb=d7b36bbbcd56ee14656223d02e32f5a1f52ea17b;hp=03f9c1e6190d065fc76f1481322541df15481a7c;hpb=d0b244f7d8c061112633a29f821a479c2355c405;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 03f9c1e..7ca001a 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -56,7 +56,7 @@ stage3 :: $(MAKE) stage=3 ifeq "$(CLEAN_ALL_STAGES)" "YES" -clean distclean:: +clean distclean maintainer-clean:: $(RM) -f prelude/primops.txt $(RM) -f $(PRIMOP_BITS) $(RM) -f $(CONFIG_HS) @@ -66,26 +66,30 @@ clean distclean:: endif ifeq "$(CLEAN_ALL_STAGES)" "YES" -clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3 +clean distclean maintainer-clean:: clean.stage.1 clean.stage.2 clean.stage.3 else -clean distclean:: clean.stage.$(stage) +clean distclean maintainer-clean:: clean.stage.$(stage) +endif + +ifeq "$(CLEAN_ALL_STAGES)" "YES" +distclean maintainer-clean:: + $(RM) -f ghc.cabal endif clean.stage.%: - -$(CABAL) clean --distpref dist-stage$* $(RM) -f Makefile-stage$* +# This is a bit naughty. We ought to use: +# -$(CABAL) clean --distpref dist-stage$* +# but that won't work if the Cabal file (a generated file) doesn't +# exist. So we do this instead: + $(RM) -rf dist-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" @@ -99,8 +103,6 @@ CONFIGURE_FLAGS_STAGE2 += --enable-shared # function which sets the keepCAFs flag for the RTS before any Haskell # code is run. CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs -else -CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs endif ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" @@ -116,31 +118,17 @@ 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 - -else -CONFIGURE_FLAGS_STAGE2 += --flags=-ghci endif ifeq "$(GhcWithNativeCodeGen)" "NO" @@ -165,9 +153,16 @@ 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 +# And if we're profiling GHC then we want lots of SCCs. +# We also don't want to waste time building the non-profiling library, +# either normally or for ghci. Unfortunately this means that we have to +# tell ghc-pkg --force as it gets upset when libHSghc-6.9.a doesn't +# exist. ifeq "$(GhcProfiled)" "YES" CONFIGURE_FLAGS_STAGE2 += --ghc-option=-auto-all +CONFIGURE_FLAGS_STAGE2 += --disable-library-vanilla +CONFIGURE_FLAGS_STAGE2 += --disable-library-for-ghci +CONFIGURE_FLAGS_STAGE2 += --ghc-pkg-option=--force endif endif @@ -194,8 +189,14 @@ 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) +# In a source dist we don't need to worry about Parser.y(.pp) as we have +# the .hs file pre-generated +ifneq "$(wildcard parser/Parser.y.pp)" "" +PARSER_Y = parser/Parser.y +endif + +boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y) + test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF) $(CABAL) configure --distpref dist-stage$* \ $(CONFIGURE_FLAGS_STAGE$*) \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ @@ -212,11 +213,11 @@ build.stage.%: doc.stage.%: $(CABAL) haddock --distpref dist-stage$* \ --haddock-option=--optghc=-DSTAGE=$* \ + --haddock-option=+RTS --haddock-option=-s --haddock-option=-c --haddock-option=-RTS \ --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock -# XXX We ought to actually install the (stage 2) library install: - @: + $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' --distpref dist-stage2 # ----------------------------------------------------------------------------- # Create compiler configuration @@ -473,6 +474,28 @@ install-docs: # binary-dist # +# Ideally we'd get these from the Cabal file's Install-Includes: +BINDIST_EXTRAS += HsVersions.h +ifeq "$(stage)" "1" +BINDIST_EXTRAS += stage1/ghc_boot_platform.h +else +BINDIST_EXTRAS += stage2plus/ghc_boot_platform.h +endif + include $(TOP)/mk/bindist.mk -LIB_DIST_DIR = dist-stage$(stage) +LIB_DIST_DIR = dist-stage2 + +#----------------------------------------------------------------------------- +# etags generation +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +GHCTAGS = $(TOP)/utils/ghctags/ghctags.exe +else +GHCTAGS = $(TOP)/utils/ghctags/ghctags-inplace +endif +GHCTAGS_ROOT = main/GHC.hs +# etags for stage2 is actually broken since it requires building +# ghctags against an older ghc api +etags: etags.stage.2 +etags.stage.%: + $(GHCTAGS) --topdir $(FPTOOLS_TOP_ABS) --etags --use-cabal-config=./dist-stage$* -- -DSTAGE=$* -- $(GHCTAGS_ROOT)