X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=336b2b0840adda96a810f3c8af09d801917347f8;hb=fb9f8859e5707f2c960540bac3efb8efc68ce6ec;hp=8f2737dd63d311514ddd33a6ace6d29966b822fc;hpb=883d980815437736c486bf69b2f066ef918d2989;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 8f2737d..336b2b0 100644 --- a/ghc.mk +++ b/ghc.mk @@ -39,8 +39,6 @@ # # * per-source-file dependencies instead of one .depend file? # * eliminate undefined variables, and use --warn-undefined-variables? -# * perhaps we should make all the output dirs in the .depend rule, to -# avoid all these mkdirhier calls? # * put outputs from different ways in different subdirs of distdir/build, # then we don't have to use -osuf/-hisuf. We would have to install # them in different places too, so we'd need ghc-pkg support for packages @@ -369,24 +367,29 @@ endif # We cannot run ghc-cabal to configure a package until we have # configured and registered all of its dependencies. So the following -# hack forces all the configure steps to happen in exactly the order -# given in the PACKAGES variable above. Ideally we should use the -# correct dependencies here to allow more parallelism, but we don't -# know the dependencies until we've generated the pacakge-data.mk -# files. +# hack forces all the configure steps to happen in exactly the following order: +# +# $(PACKAGES) ghc(stage2) $(PACKAGES_STAGE2) +# +# Ideally we should use the correct dependencies here to allow more +# parallelism, but we don't know the dependencies until we've +# generated the pacakge-data.mk files. define fixed_pkg_dep -libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(if $$(fixed_pkg_prev),libraries/$$(fixed_pkg_prev)/$2/package-data.mk) -fixed_pkg_prev:=$1 +libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(fixed_pkg_prev) +fixed_pkg_prev:=libraries/$1/$2/package-data.mk endef ifneq "$(BINDIST)" "YES" fixed_pkg_prev= -$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) +$(foreach pkg,$(PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) + +# the GHC package doesn't live in libraries/, so we add its dependency manually: +compiler/stage2/package-data.mk: $(fixed_pkg_prev) +fixed_pkg_prev:=compiler/stage2/package-data.mk + +# and continue with PACKAGES_STAGE2, which depend on GHC: +$(foreach pkg,$(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) -# We assume that the stage2 compiler depends on all the libraries, so -# they all get added to the package database before we try to configure -# it -compiler/stage2/package-data.mk: $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),libraries/$(pkg)/dist-install/package-data.mk) ghc/stage1/package-data.mk: compiler/stage1/package-data.mk ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # haddock depends on ghc and some libraries, but depending on GHC's @@ -405,6 +408,9 @@ endif # ----------------------------------------------------------------------------- # Directories +# Don't try to delete directories: +.PRECIOUS: %/. + %/. : $(MKDIRHIER) "$(MKDIRHIER)" $@ @@ -520,11 +526,12 @@ endif ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) +endif + ifneq "$(BootingFromHc)" "YES" BUILD_DIRS += \ libraries/dph endif -endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp @@ -685,26 +692,11 @@ endif ifeq "$(Windows)" "YES" -# directories don't work well as dependencies, hence a stamp file -$(INPLACE)/stamp-mingw : $(MKDIRHIER) - $(MKDIRHIER) $(INPLACE_MINGW)/bin - GCC=`type -p $(WhatGccIsCalled)`; \ - GccDir=`dirname $$GCC`; \ - "$(CP)" -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \ - "$(CP)" -Rp $$GccDir/../include $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../lib $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../libexec $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../mingw32 $(INPLACE_MINGW) - touch $(INPLACE)/stamp-mingw - install : install_mingw .PHONY: install_mingw install_mingw : $(INPLACE_MINGW) "$(CP)" -Rp $(INPLACE_MINGW) $(prefix) -$(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll : - "$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) - endif # Windows libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ @@ -757,16 +749,24 @@ install_libs: $(INSTALL_LIBS) done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) +ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" + @: +else $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done +endif install_libexecs: $(INSTALL_LIBEXECS) +ifeq "$(INSTALL_LIBEXECS)" "" + @: +else $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXECS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done +endif install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) $(INSTALL_DIR) $(DESTDIR)$(topdir) @@ -788,18 +788,24 @@ install_headers: $(INSTALL_HEADERS) install_docs: $(INSTALL_HEADERS) $(INSTALL_DIR) $(DESTDIR)$(docdir) +ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \ done - $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \ - $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \ +endif + $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html + $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html +ifneq "$(INSTALL_LIBRARY_DOCS)" "" for i in $(INSTALL_LIBRARY_DOCS); do \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \ done +endif +ifneq "$(INSTALL_HTML_DOC_DIRS)" "" for i in $(INSTALL_HTML_DOC_DIRS); do \ $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \ done +endif INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d @@ -816,6 +822,21 @@ endif INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES)) HIDDEN_PACKAGES = binary +define set_INSTALL_DISTDIR +# $1 = libraries/base, $2 = dist-install +# => +# INSTALL_DISTDIR_libraries/base = dist-install +INSTALL_DISTDIR_$1 = $2 +endef + +$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ +$(call set_INSTALL_DISTDIR,libraries/$p,dist-install))) +INSTALL_DISTDIR_compiler = stage2 + +ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \ + compiler \ + $(addprefix libraries/,$(PACKAGES_STAGE2)) + install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install $(INSTALL_DIR) $(DESTDIR)$(topdir) @@ -823,24 +844,17 @@ install_packages: libffi/package.conf.install rts/package.conf.install $(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, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ + $(foreach p, $(ALL_INSTALLED_PACKAGES),\ "$(GHC_CABAL_INPLACE)" install \ $(INSTALLED_GHC_REAL) \ $(INSTALLED_GHC_PKG_REAL) \ $(DESTDIR)$(topdir) \ - libraries/$p dist-install \ + $p $(INSTALL_DISTDIR_$p) \ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \ $(RelocatableBuild) &&) true $(foreach p, $(HIDDEN_PACKAGES),\ $(INSTALLED_GHC_PKG_REAL) --global-conf $(INSTALLED_PACKAGE_CONF) \ hide $p &&) true - "$(GHC_CABAL_INPLACE)" install \ - $(INSTALLED_GHC_REAL) \ - $(INSTALLED_GHC_PKG_REAL) \ - $(DESTDIR)$(topdir) \ - compiler stage2 \ - '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \ - $(RelocatableBuild) # ----------------------------------------------------------------------------- # Binary distributions @@ -864,6 +878,7 @@ $(eval $(call bindist,.,\ $(BINDIST_EXTRAS) \ $(includes_H_CONFIG) \ $(includes_H_PLATFORM) \ + $(includes_H_FILES) \ includes/ghcconfig.h \ includes/rts/Config.h \ $(INSTALL_HEADERS) \ @@ -892,8 +907,8 @@ endif BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk unix-binary-dist-prep: - "$(RM)" $(RM_OPTS) -r bindistprep/* - mkdir $(BIN_DIST_PREP_DIR) + "$(RM)" $(RM_OPTS) -r bindistprep/ + "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR) set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK) @@ -908,12 +923,16 @@ unix-binary-dist-prep: cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-binary-dist-prep: - "$(RM)" $(RM_OPTS) -r bindistprep/* + "$(RM)" $(RM_OPTS) -r bindistprep/ $(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-installer: - "$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss +ifeq "$(ISCC)" "" + @echo No ISCC, so not making installer +else + "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss +endif nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done @@ -971,17 +990,13 @@ VERSION : sdist : VERSION # Use: -# $(call sdist_file,compiler,stage2,cmm,CmmLex,x) -# to copy the generated file that replaces compiler/cmm/CmmLex.x, where +# $(call sdist_file,compiler,stage2,cmm,Foo/Bar,CmmLex,x) +# to copy the generated file that replaces compiler/cmm/Foo/Bar/CmmLex.x, where # "stage2" is the dist dir. -sdist_file = \ - if test -f $(TOP)/$1/$2/build/$4.hs; then \ - "$(CP)" $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \ - mv $1/$3/$4.$5 $1/$3/$4.$5.source ;\ - else \ - echo "does not exist: $1/$2/build/$4.hs"; \ - exit 1; \ - fi +define sdist_file + "$(CP)" $1/$2/build/$4/$5.hs $(SRC_DIST_DIR)/$1/$3/$4 + mv $(SRC_DIST_DIR)/$1/$3/$4/$5.$6 $(SRC_DIST_DIR)/$1/$3/$4/$5.$6.source +endef .PHONY: sdist-prep sdist-prep : @@ -993,15 +1008,16 @@ sdist-prep : cd $(SRC_DIST_DIR) && $(MAKE) distclean rm -rf $(SRC_DIST_DIR)/libraries/tarballs/ rm -rf $(SRC_DIST_DIR)/libraries/stamp/ - cd $(SRC_DIST_DIR) && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then "$(CP)" $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi - cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmLex,x) - cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmParse,y) - cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Lexer,x) - cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Parser,y.pp) - cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,ParserCore,y) - cd $(SRC_DIST_DIR) && $(call sdist_file,utils/hpc,dist,,HpcParser,y) - cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x) - cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Parser,y) + $(call sdist_file,compiler,stage2,cmm,,CmmLex,x) + $(call sdist_file,compiler,stage2,cmm,,CmmParse,y) + $(call sdist_file,compiler,stage2,parser,,Lexer,x) + $(call sdist_file,compiler,stage2,parser,,Parser,y.pp) + $(call sdist_file,compiler,stage2,parser,,ParserCore,y) + $(call sdist_file,utils/hpc,dist,,,HpcParser,y) + $(call sdist_file,utils/genprimopcode,dist,,,Lexer,x) + $(call sdist_file,utils/genprimopcode,dist,,,Parser,y) + $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Lex,x) + $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Parse,y) cd $(SRC_DIST_DIR) && "$(RM)" $(RM_OPTS) -r compiler/stage[123] mk/build.mk cd $(SRC_DIST_DIR) && "$(FIND)" $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r @@ -1069,6 +1085,11 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\ $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install))) endif +clean : clean_bindistprep +.PHONY: clean_bindistprep +clean_bindistprep: + "$(RM)" $(RM_OPTS) -r bindistprep/ + distclean : clean "$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h "$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk