X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=91b5d3d9772e1a7509e484c8122e07f7a7222b90;hb=930421d4ed09e5389e0ef4c5eef36075a6809cc0;hp=42022c9a1e54f9f83f90aafddd95c0d44177fd02;hpb=afcf3b2a47512fd5f5cbb98da186c81dadb1de43;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 42022c9..91b5d3d 100644 --- a/ghc.mk +++ b/ghc.mk @@ -34,7 +34,6 @@ # Tickets we can now close, or fix and close: # # * 1693 make distclean -# * 3173 make install with DESTDIR # Possible cleanups: # @@ -172,6 +171,8 @@ libraries/hpc_dist-boot_DO_HADDOCK = NO libraries/Cabal_dist-boot_DO_HADDOCK = NO libraries/extensible-exceptions_dist-boot_DO_HADDOCK = NO libraries/filepath_dist-boot_DO_HADDOCK = NO +libraries/binary_dist-boot_DO_HADDOCK = NO +libraries/bin-package-db_dist-boot_DO_HADDOCK = NO # ----------------------------------------------------------------------------- # Ways @@ -184,7 +185,6 @@ $(foreach way,$(ALL_WAYS),\ # ----------------------------------------------------------------------------- # Compilation Flags -include rules/distdir-opts.mk include rules/distdir-way-opts.mk # ----------------------------------------------------------------------------- @@ -322,6 +322,8 @@ $(eval $(call addPackage,syb)) $(eval $(call addPackage,template-haskell)) $(eval $(call addPackage,base3-compat)) $(eval $(call addPackage,Cabal)) +$(eval $(call addPackage,binary)) +$(eval $(call addPackage,bin-package-db)) $(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) @@ -339,7 +341,9 @@ PACKAGES_STAGE2 += \ dph/dph-par endif -BOOT_PKGS = Cabal hpc extensible-exceptions +# We assume that the stage0 compiler has a suitable bytestring package, +# so we don't have to include it below. +BOOT_PKGS = Cabal hpc extensible-exceptions binary bin-package-db # The actual .a and .so/.dll files: needed for dependencies. ALL_STAGE1_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) @@ -597,10 +601,12 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports .PHONY: stage1_libs stage1_libs : $(ALL_STAGE1_LIBS) +ifeq "$(HADDOCK_DOCS)" "YES" libraries/index.html: $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace $(eval $(call all-target,library_doc_index,libraries/index.html)) INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js +endif ifeq "$(CHECK_PACKAGES)" "YES" all: check_packages @@ -628,6 +634,8 @@ $(eval $(call clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF))) $(eval $(call build-package,libraries/hpc,dist-boot,0)) $(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)) # register the boot packages in strict sequence, because running # multiple ghc-pkgs in parallel doesn't work (registrations may get @@ -638,13 +646,23 @@ $(foreach pkg,$(BOOT_PKGS),$(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/extensible-exceptions/dist-boot/package-data.mk \ + libraries/bin-package-db/dist-boot/package-data.mk # These are necessary because the bootstrapping compiler may not know # about cross-package dependencies: $(compiler_stage1_depfile) : $(BOOT_LIBS) $(ghc_stage1_depfile) : $(compiler_stage1_v_LIB) +# A few careful dependencies between bootstrapping packages. When we +# can rely on the stage 0 compiler being able to generate +# cross-package dependencies with -M (fixed in GHC 6.12.1) we can drop +# these, and also some of the phases. +# +# If you miss any out here, then 'make -j8' will probably tell you. +# +libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) + $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) endif @@ -770,41 +788,47 @@ install_docs: $(INSTALL_HEADERS) $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \ done -INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf +INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d # Install packages in the right order, so that ghc-pkg doesn't complain. # Also, install ghc-pkg first. ifeq "$(Windows)" "NO" +INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg else +INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc-stage2.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install $(INSTALL_DIR) $(DESTDIR)$(topdir) - "$(RM)" $(RM_OPTS) $(INSTALLED_PACKAGE_CONF) - $(CREATE_DATA) $(INSTALLED_PACKAGE_CONF) - echo "[]" >> $(INSTALLED_PACKAGE_CONF) + "$(RM)" -r $(RM_OPTS) $(INSTALLED_PACKAGE_CONF) + $(INSTALL_DIR) $(INSTALLED_PACKAGE_CONF) "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install $(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\ "$(GHC_CABAL_INPLACE)" install \ + $(INSTALLED_GHC_REAL) \ $(INSTALLED_GHC_PKG_REAL) \ - $(INSTALLED_PACKAGE_CONF) \ + $(DESTDIR)$(topdir) \ libraries/$p dist-install \ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true "$(GHC_CABAL_INPLACE)" install \ + $(INSTALLED_GHC_REAL) \ $(INSTALLED_GHC_PKG_REAL) \ - $(INSTALLED_PACKAGE_CONF) \ + $(DESTDIR)$(topdir) \ compiler stage2 \ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' # ----------------------------------------------------------------------------- # Binary distributions -# This is split in 2 because of the shell argument limit -$(eval $(call bindist,root1,\ +ifneq "$(CLEANING)" "YES" +# This rule seems to hold some files open on Windows which prevents +# cleaning, perhaps due to the $(wildcard). + +$(eval $(call bindist,.,\ LICENSE \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ @@ -825,8 +849,6 @@ $(eval $(call bindist,root1,\ $(INSTALL_BINS) \ $(INSTALL_DOCS) \ $(INSTALL_LIBRARY_DOCS) \ - )) -$(eval $(call bindist,root2,\ $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ docs/index.html \ $(wildcard libraries/*/dist-install/doc/) \ @@ -838,6 +860,7 @@ $(eval $(call bindist,root2,\ bindist.mk \ libraries/dph/LICENSE \ )) +endif # mk/project.mk gets an absolute path, so we manually include it in # the bindist with a relative path @@ -975,7 +998,7 @@ publish-sdist : $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif -ifeq "$(BootingFromUnregisterisedHc)" "YES" +ifeq "$(BootingFromHc)" "YES" SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt) endif @@ -989,20 +1012,25 @@ CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o CLEAN_FILES += libraries/bootstrapping.conf -CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h -CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants -clean : clean_files clean_libraries clean_gmp +clean : clean_files clean_libraries .PHONY: clean_files 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) -r libraries/integer-gmp/gmp/objs "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/gmpbuild +endif .PHONY: clean_libraries clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2))