X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=f818482e3458b4bd76b7691e82b99b47f627616d;hp=7853affa3d79b81d01cd3d8e568c34943c0130c5;hb=9e5a454cd78650a0c9e2a859693ee1af056b3fb9;hpb=ac77a1eba3a7673241f371ce4aa6bf56323383bc diff --git a/ghc.mk b/ghc.mk index 7853aff..f818482 100644 --- a/ghc.mk +++ b/ghc.mk @@ -1,3 +1,4 @@ + # ----------------------------------------------------------------------------- # # (c) 2009 The University of Glasgow @@ -135,9 +136,14 @@ $(error $$(GhcLibWays) is empty, it must contain at least one way) endif endif +ifeq "$(phase)" "" +phase = final +endif + # ----------------------------------------------------------------------------- # Utility definitions +include rules/prof.mk include rules/trace.mk include rules/make-command.mk @@ -222,6 +228,7 @@ include rules/package-config.mk # Building dependencies include rules/build-dependencies.mk +include rules/include-dependencies.mk # ----------------------------------------------------------------------------- # Build package-data.mk files @@ -305,7 +312,7 @@ TH_PACKAGES := $(DPH_PACKAGES) # # We assume that the stage0 compiler has a suitable bytestring package, # so we don't have to include it below. -STAGE0_PACKAGES = Cabal hpc extensible-exceptions binary bin-package-db +STAGE0_PACKAGES = Cabal hpc extensible-exceptions binary bin-package-db hoopl # These packages are installed, but are installed hidden # Why install them at all? Because the 'ghc' package depends on them @@ -388,6 +395,7 @@ $(eval $(call addPackage,template-haskell)) $(eval $(call addPackage,Cabal)) $(eval $(call addPackage,binary)) $(eval $(call addPackage,bin-package-db)) +$(eval $(call addPackage,hoopl)) $(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) $(eval $(call addPackage,xhtml)) @@ -493,19 +501,17 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins ifneq "$(CLEANING)" "YES" ifeq "$(INTEGER_LIBRARY)" "integer-gmp" libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple +else ifeq "$(INTEGER_LIBRARY)" "integer-simple" +libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple else - ifeq "$(INTEGER_LIBRARY)" "integer-simple" - libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple - else $(error Unknown integer library: $(INTEGER_LIBRARY)) - endif endif endif # ---------------------------------------------- # Checking packages with 'cabal check' -ifeq "$(phase)" "" +ifeq "$(phase)" "final" ifeq "$(CHECK_PACKAGES)" "YES" all: check_packages endif @@ -569,6 +575,8 @@ endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp +else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" +BUILD_DIRS += libraries/integer-gmp/gmp endif BUILD_DIRS += \ @@ -603,65 +611,6 @@ BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) endif -# ----------------------------------------------------------------------------- -# Phase handling - -phase_0_or_later = YES -ifeq "$(findstring $(phase),0)" "" -phase_0_done = YES -phase_1_or_later = YES -endif -ifeq "$(findstring $(phase),0 1)" "" -phase_1_done = YES -phase_2_or_later = YES -endif -ifeq "$(findstring $(phase),0 1 2)" "" -phase_2_done = YES -phase_3_or_later = YES -endif -ifeq "$(findstring $(phase),0 1 2 3)" "" -phase_3_done = YES -endif - -includes_dist-derivedconstants_CONFIGURE_PHASE = 0 -includes_dist-ghcconstants_CONFIGURE_PHASE = 0 - -# We do these first, as making the sources for some later -# packages needs them, and we need the sources before we can -# work out dependencies -utils/hsc2hs_dist_CONFIGURE_PHASE = 0 -utils/unlit_dist_CONFIGURE_PHASE = 0 -utils/genprimopcode_dist_CONFIGURE_PHASE = 0 - -# Then the bootlibs -$(foreach lib,$(STAGE0_PACKAGES),$(eval \ - libraries/$(lib)_dist-boot_CONFIGURE_PHASE = 1)) -compiler_stage1_CONFIGURE_PHASE = 1 -ghc_stage1_CONFIGURE_PHASE = 1 - -# In phase 2, the phase 1 things actually get built - -# Finally, the stage1 compiler is used to make the dependencies for -# everything else, so we can now build the rest. -compiler_stage2_CONFIGURE_PHASE = 3 -ghc_stage2_CONFIGURE_PHASE = 3 - -$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ - libraries/$(lib)_dist-install_CONFIGURE_PHASE = 3)) - -utils/hp2ps_dist_CONFIGURE_PHASE = 3 -utils/genapply_dist_CONFIGURE_PHASE = 3 -utils/haddock_dist_CONFIGURE_PHASE = 3 -utils/hsc2hs_dist-install_CONFIGURE_PHASE = 3 -utils/ghc-pkg_dist-install_CONFIGURE_PHASE = 3 -utils/hpc_dist_CONFIGURE_PHASE = 3 -utils/runghc_dist_CONFIGURE_PHASE = 3 -utils/ghctags_dist_CONFIGURE_PHASE = 3 -utils/ghc-pwd_dist_CONFIGURE_PHASE = 3 -utils/ghc-cabal_dist-install_CONFIGURE_PHASE = 3 -utils/mkUserGuidePart_dist_CONFIGURE_PHASE = 3 -utils/compare_sizes_dist_CONFIGURE_PHASE = 3 - # ---------------------------------------------- # Actually include all the sub-ghc.mk's @@ -697,9 +646,9 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO)) # Build the Haddock contents and index ifeq "$(HADDOCK_DOCS)" "YES" -libraries/index.html: inplace/bin/haddock $(ALL_HADDOCK_FILES) +libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace -ifeq "$(phase)" "" +ifeq "$(phase)" "final" $(eval $(call all-target,library_doc_index,libraries/index.html)) endif INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js @@ -731,6 +680,7 @@ $(eval $(call build-package,libraries/extensible-exceptions,dist-boot,0)) $(eval $(call build-package,libraries/Cabal,dist-boot,0)) $(eval $(call build-package,libraries/binary,dist-boot,0)) $(eval $(call build-package,libraries/bin-package-db,dist-boot,0)) +$(eval $(call build-package,libraries/hoopl,dist-boot,0)) # register the boot packages in strict sequence, because running # multiple ghc-pkgs in parallel doesn't work (registrations may get @@ -738,11 +688,7 @@ $(eval $(call build-package,libraries/bin-package-db,dist-boot,0)) fixed_pkg_prev= $(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot))) -compiler/stage1/package-data.mk : \ - libraries/Cabal/dist-boot/package-data.mk \ - libraries/hpc/dist-boot/package-data.mk \ - libraries/extensible-exceptions/dist-boot/package-data.mk \ - libraries/bin-package-db/dist-boot/package-data.mk +compiler/stage1/package-data.mk : $(fixed_pkg_prev) # Make sure we have all the GHCi libs by the time we've built # ghc-stage2. DPH includes a bit of Template Haskell which needs the @@ -1189,17 +1135,6 @@ clean : clean_files clean_libraries clean_files : "$(RM)" $(RM_OPTS) $(CLEAN_FILES) -ifneq "$(NO_CLEAN_GMP)" "YES" -CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h -CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a - -clean : clean_gmp -.PHONY: clean_gmp -clean_gmp: - "$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/objs - "$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/gmpbuild -endif - .PHONY: clean_libraries clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(STAGE0_PACKAGES)) @@ -1265,3 +1200,27 @@ bootstrapping-files: includes/GHCConstants.h .DELETE_ON_ERROR: +# ----------------------------------------------------------------------------- +# Numbered phase targets + +.PHONY: phase_0_builds +phase_0_builds: $(utils/hsc2hs_dist_depfile_haskell) +phase_0_builds: $(utils/hsc2hs_dist_depfile_c_asm) +phase_0_builds: $(utils/genprimopcode_dist_depfile_haskell) +phase_0_builds: $(utils/genprimopcode_dist_depfile_c_asm) + +.PHONY: phase_1_builds +phase_1_builds: $(PACKAGE_DATA_MKS) + +# ----------------------------------------------------------------------------- +# Support for writing GHC passes in Coq + +compiler/coq/Makefile: + git submodule update --init compiler/coq + cd compiler/coq/; git checkout master +compiler/coq/build/CoqPass.hs: compiler/coq/Makefile $(wildcard compiler/coq/src/*.v) $(wildcard compiler/coq/src/*.hs) + cd compiler/coq; make +compiler/stage1/build/CoqPass.hs: compiler/coq/build/CoqPass.hs + cp compiler/coq/build/CoqPass.hs $@ +compiler/stage2/build/CoqPass.hs: compiler/coq/build/CoqPass.hs + cp compiler/coq/build/CoqPass.hs $@