X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=b6df093d335bd738ddd1d04d454a68511166d86b;hp=5961ae3460145422bb000e814ae681200388c3a2;hb=7bb3d1fc79521d591cd9f824893963141a7997b6;hpb=0fbbe3e90ccf7af533b66f0d3893981ed1676ada diff --git a/ghc.mk b/ghc.mk index 5961ae3..b6df093 100644 --- a/ghc.mk +++ b/ghc.mk @@ -12,51 +12,32 @@ # ToDo List. # -# Before we can merge the new build system into HEAD: -# # * finish installation # * other documentation # * create doc index and contents # * Windows: should we have ghc-pkg-? # * should we be stripping things? # * install libgmp.a, gmp.h -# * finish binary distributions # * need to fix Cabal for new Windows layout, see # Distribution/Simple/GHC.configureToolchain. -# -# Once the new build system is in HEAD, and before 6.12: -# -# * separate the logic of whether to do something from the test for -# existence of the tool to do it. For example, rather than checking -# if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable -# for controlling the building of the docs. # * remove old Makefiles, add new stubs for building in subdirs -# * utils/hsc2hs/Makefile -# * utils/haddock/Makefile # * docs/Makefile # * docs/docbook-cheat-sheet/Makefile # * docs/ext-core/Makefile # * docs/man/Makefile # * docs/storage-mgmt/Makefile -# * docs/users_guide/Makefile # * docs/vh/Makefile -# * driver/Makefile -# * driver/ghc/Makefile -# * libraries/Makefile # * rts/dotnet/Makefile # * utils/Makefile # * GhcProfiled # * optionally install stage3? # * shared libraries, way dyn -# * get HC bootstrapping working # * add Makefiles for the rest of the utils/ programs that aren't built # by default (need to exclude them from 'make all' too) # # Tickets we can now close, or fix and close: # -# * 2966 make sure --with-gcc does the right thing (#2966) # * 1693 make distclean -# * 2689 make maintainer-clean # * 3173 make install with DESTDIR # Possible cleanups: @@ -105,6 +86,8 @@ # o libraries/* # o compiler +.PHONY: default all haddock + default : all # Just bring makefiles up to date: @@ -137,18 +120,23 @@ show: # ----------------------------------------------------------------------------- # Include subsidiary build-system bits -include mk/config.mk +include mk/tree.mk +ifeq "$(findstring clean,$(MAKECMDGOALS))" "" +include mk/config.mk ifeq "$(ProjectVersion)" "" $(error Please run ./configure first) endif +endif # (Optional) build-specific configuration include mk/custom-settings.mk +ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ifeq "$(GhcLibWays)" "" $(error $$(GhcLibWays) is empty, it must contain at least one way) endif +endif # ----------------------------------------------------------------------------- # Macros for standard targets @@ -171,6 +159,10 @@ ifneq "$(findstring clean,$(MAKECMDGOALS))" "" NO_INCLUDE_DEPS = YES NO_INCLUDE_PKGDATA = YES endif +ifneq "$(findstring bootstrapping-files,$(MAKECMDGOALS))" "" +NO_INCLUDE_DEPS = YES +NO_INCLUDE_PKGDATA = YES +endif ifeq "$(findstring show,$(MAKECMDGOALS))" "show" NO_INCLUDE_DEPS = YES # We want package-data.mk for show @@ -207,10 +199,15 @@ include rules/c-sources.mk include rules/includes-sources.mk include rules/hs-objs.mk include rules/c-objs.mk +include rules/cmm-objs.mk # ----------------------------------------------------------------------------- # Suffix rules +# Suffix rules cause "make clean" to fail on Windows (trac #3233) +# so we don't make any when cleaning. +ifneq "$(CLEANING)" "YES" + include rules/hs-suffix-rules-srcdir.mk include rules/hs-suffix-rules.mk @@ -227,6 +224,13 @@ $(foreach way,$(ALL_WAYS),\ include rules/c-suffix-rules.mk +#----------------------------------------------------------------------------- +# CMM-related suffix rules + +include rules/cmm-suffix-rules.mk + +endif + # ----------------------------------------------------------------------------- # Building package-data.mk files from .cabal files @@ -282,6 +286,7 @@ include rules/bindist.mk PACKAGES = \ ghc-prim \ integer-gmp \ + integer \ base \ filepath \ array \ @@ -303,7 +308,6 @@ PACKAGES += \ extensible-exceptions \ haskell98 \ hpc \ - packedstring \ pretty \ syb \ template-haskell \ @@ -318,8 +322,8 @@ endif PACKAGES += haskeline -ifneq "$(wildcard libraries/dph)" "" -PACKAGES += \ +ifneq "$(BootingFromHc)" "YES" +PACKAGES_STAGE2 += \ dph/dph-base \ dph/dph-prim-interface \ dph/dph-prim-seq \ @@ -331,9 +335,9 @@ endif BOOT_PKGS = Cabal hpc extensible-exceptions # The actual .a and .so/.dll files: needed for dependencies. -ALL_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) +ALL_STAGE1_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) ifeq "$(BuildSharedLibs)" "YES" -ALL_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB)) +ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB)) endif BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB)) @@ -341,9 +345,6 @@ OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o ifeq "$(BuildSharedLibs)" "YES" OTHER_LIBS += libffi/libHSffi$(dyn_libsuf) endif -ifeq "$(HaveLibGmp)" "NO" -OTHER_LIBS += gmp/libgmp.a -endif # We cannot run ghc-cabal to configure a package until we have # configured and registered all of its dependencies. So the following @@ -353,18 +354,20 @@ endif # 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) +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 endef ifneq "$(BINDIST)" "YES" fixed_pkg_prev= -$(foreach pkg,$(PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) +$(foreach pkg,$(PACKAGES) $(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),libraries/$(pkg)/dist-install/package-data.mk) +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 # package-data.mk is sufficient, as that in turn depends on all the # libraries @@ -399,11 +402,11 @@ endef PRIMOPS_TXT = $(GHC_COMPILER_DIR)/prelude/primops.txt libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(GENPRIMOP_INPLACE) --make-haskell-source <$(PRIMOPS_TXT) >$@ + "$(GENPRIMOP_INPLACE)" --make-haskell-source <$(PRIMOPS_TXT) >$@ # ----------------------------------------------------------------------------- @@ -452,14 +455,17 @@ BUILD_DIRS += \ endif BUILD_DIRS += \ - gmp \ docs/users_guide \ libraries/Cabal/doc \ - $(GHC_MANGLER_DIR) \ - $(GHC_SPLIT_DIR) \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) +ifneq "$(GhcUnregisterised)" "YES" +BUILD_DIRS += \ + $(GHC_MANGLER_DIR) \ + $(GHC_SPLIT_DIR) +endif + ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ $(GHC_GENPRIMOP_DIR) @@ -481,11 +487,22 @@ endif BUILD_DIRS += \ utils/haddock \ - $(patsubst %, libraries/%, $(PACKAGES)) \ + utils/haddock/doc + +ifneq "$(CLEANING)" "YES" +BUILD_DIRS += \ + $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) +ifneq "$(BootingFromHc)" "YES" +BUILD_DIRS += \ + libraries/dph +endif +endif + +BUILD_DIRS += \ + libraries/integer-gmp/gmp \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ - utils/hasktags \ utils/hpc \ utils/runghc \ ghc @@ -516,20 +533,16 @@ ifneq "$(findstring $(phase),0 1 2 3)" "" utils/haddock_dist_DISABLE = YES utils/runghc_dist_DISABLE = YES utils/hpc_dist_DISABLE = YES -utils/hasktags_dist_DISABLE = YES utils/hsc2hs_dist-install_DISABLE = YES utils/ghc-pkg_dist-install_DISABLE = YES compiler_stage2_DISABLE = YES compiler_stage3_DISABLE = YES ghc_stage2_DISABLE = YES ghc_stage3_DISABLE = YES -$(foreach lib,$(PACKAGES),$(eval \ +$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ libraries/$(lib)_dist-install_DISABLE = YES)) endif -ifneq "$(wildcard libraries/dph)" "" -include libraries/dph/ghc.mk -endif include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) # We need -fno-warn-deprecated-flags to avoid failure with -Werror @@ -539,14 +552,21 @@ GhcBootLibHcOpts += -fno-warn-deprecated-flags endif # Add $(GhcLibHcOpts) to all library builds -$(foreach pkg,$(PACKAGES),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) +$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) -# XXX we configure packages with the bootsrapping compiler (for +# XXX Hack; remove this +$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn)) + +# XXX we configure packages with the bootstrapping compiler (for # dependency reasons, see the phase ordering), which doesn't # necessarily support all the extensions we need, and Cabal filters # out the ones it thinks aren't supported. libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports +# A useful pseudo-target +.PHONY: stage1_libs +stage1_libs : $(ALL_STAGE1_LIBS) + # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -555,9 +575,11 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports ifneq "$(BINDIST)" "YES" +ifneq "$(BOOTSTRAPPING_CONF)" "" ifeq "$(wildcard $(BOOTSTRAPPING_CONF))" "" $(shell echo "[]" >$(BOOTSTRAPPING_CONF)) endif +endif $(eval $(call clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF))) @@ -598,20 +620,20 @@ $(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) + "$(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) + "$(CP)" -Rp $(INPLACE_MINGW) $(prefix) $(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll : - $(CP) $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) + "$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) endif # Windows @@ -621,13 +643,13 @@ libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-source < $< > $@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers < $< > $@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@ # ----------------------------------------------------------------------------- # Installation @@ -664,13 +686,13 @@ install_libs: $(INSTALL_LIBS) done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) + "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \ done install_libexecs: $(INSTALL_LIBEXECS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) + "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) for i in $(INSTALL_LIBEXECS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \ done @@ -693,17 +715,17 @@ endif install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(MKDIRHIER) $(DESTDIR)$(libdir) + "$(MKDIRHIER)" $(DESTDIR)$(libdir) echo "[]" > $(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),\ - $(GHC_CABAL_INPLACE) install \ + "$(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_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ libraries/$p dist-install \ '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' &&) true - $(GHC_CABAL_INPLACE) install \ + "$(GHC_CABAL_INPLACE)" install \ $(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ compiler stage2 \ @@ -733,26 +755,38 @@ $(eval $(call bindist,.,\ $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ mk/fix_install_names.sh \ mk/project.mk \ + libraries/dph/LICENSE \ )) # mk/project.mk gets an absolute path, so we manually include it in # the bindist with a relative path binary-dist: - $(RM) -rf $(BIN_DIST_NAME) + "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) mkdir $(BIN_DIST_NAME) - set -e; for i in LICENSE compiler ghc rts libraries utils gmp 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_NAME)/; done + 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_NAME)/; done ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac cd $(BIN_DIST_NAME) && autoreconf - $(RM) -f $(BIN_DIST_TAR) + "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR) # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source # tree then we want to include the real file, not a symlink to it - $(TAR) hcf - -T $(BIN_DIST_LIST) | bzip2 -c >$(BIN_DIST_TAR_BZ2) + "$(TAR)" hcf - -T $(BIN_DIST_LIST) | bzip2 -c > $(BIN_DIST_TAR_BZ2) + +windows-binary-dist: + "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) + $(MAKE) prefix=$(BIN_DIST_DIR) install + "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > $(BIN_DIST_TAR_BZ2) + +windows-installer: + "$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done .PHONY: publish-binary-dist publish-binary-dist: $(call nTimes,10,$(PublishCp) $(BIN_DIST_TAR_BZ2) $(PublishLocation)/dist) +ifeq "$(mingw32_TARGET_OS)" "1" + $(call nTimes,10,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) +endif # ----------------------------------------------------------------------------- # Source distributions @@ -782,16 +816,14 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS = mk rules docs distrib bindisttest gmp libffi includes utils docs rts compiler ghc driver libraries +SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ - ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk + ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \ + boot boot-pkgs packages ghc.mk -EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^\#" | sed "s/ .*//")) - -SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 -SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2 +SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2 VERSION : echo $(ProjectVersion) >VERSION @@ -804,7 +836,7 @@ sdist : VERSION # "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/ ; \ + "$(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"; \ @@ -813,14 +845,14 @@ sdist_file = \ .PHONY: sdist-prep sdist-prep : - $(RM) -rf $(SRC_DIST_DIR) - $(RM) $(SRC_DIST_NAME).tar.gz + "$(RM)" $(RM_OPTS) -r $(SRC_DIST_DIR) + "$(RM)" $(RM_OPTS) $(SRC_DIST_TARBALL) mkdir $(SRC_DIST_DIR) ( cd $(SRC_DIST_DIR) \ && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(TOP)/$$i ); done \ && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done \ && $(MAKE) distclean \ - && 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 \ + && 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 \ && $(call sdist_file,compiler,stage2,cmm,CmmLex,x) \ && $(call sdist_file,compiler,stage2,cmm,CmmParse,y) \ && $(call sdist_file,compiler,stage2,main,ParsePkgConf,y) \ @@ -832,15 +864,13 @@ sdist-prep : && $(call sdist_file,utils/hpc,dist,,HpcParser,y) \ && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x) \ && $(call sdist_file,utils/genprimopcode,dist,,Parser,y) \ - && $(RM) -rf compiler/stage[123] mk/build.mk \ - && $(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) -rf \ + && "$(RM)" $(RM_OPTS) -r compiler/stage[123] mk/build.mk \ + && "$(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 \ ) .PHONY: sdist sdist : sdist-prep - $(TAR) chf - $(EXTRA_LIBS) | bzip2 >$(TOP)/$(SRC_DIST_EXTRALIBS_TARBALL) - $(RM) -rf $(EXTRA_LIBS) - $(TAR) chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) + "$(TAR)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) sdist-manifest : $(SRC_DIST_TARBALL) tar tjf $(SRC_DIST_TARBALL) | sed "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest @@ -850,12 +880,11 @@ sdist-manifest : $(SRC_DIST_TARBALL) # over SSH. ifneq "$(PublishLocation)" "" publish-sdist : - $(call nTimes,10,$(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist) $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif ifeq "$(GhcUnregisterised)" "YES" -SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER +SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt) endif # ----------------------------------------------------------------------------- @@ -867,33 +896,69 @@ CLEAN_FILES += utils/ghc-pwd/ghc-pwd 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 : clean_files clean_libraries -clean : clean_files .PHONY: clean_files clean_files : - $(RM) $(CLEAN_FILES) + "$(RM)" $(RM_OPTS) $(CLEAN_FILES) + +.PHONY: clean_libraries +clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) +clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS)) + +clean_libraries: + "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/*.buildinfo, $(PACKAGES) $(PACKAGES_STAGE2)) + +# We have to define a clean target for each library manually, because the +# libraries/*/ghc.mk files are not included when we're cleaning. +ifeq "$(CLEANING)" "YES" +$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\ + $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install))) +endif distclean : clean - $(RM) config.cache config.status config.log mk/config.h mk/stamp-h - $(RM) mk/config.mk mk/are-validating.mk mk/project.mk - $(RM) extra-gcc-opts docs/users_guide/ug-book.xml - $(RM) compiler/ghc.cabal ghc/ghc-bin.cabal - $(RM) libraries/base/include/HsBaseConfig.h - $(RM) libraries/directory/include/HsDirectoryConfig.h - $(RM) libraries/process/include/HsProcessConfig.h - $(RM) libraries/unix/include/HsUnixConfig.h - $(RM) libraries/old-time/include/HsTimeConfig.h + "$(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 + "$(RM)" $(RM_OPTS) mk/config.mk.old mk/project.mk.old + "$(RM)" $(RM_OPTS) extra-gcc-opts docs/users_guide/ug-book.xml + "$(RM)" $(RM_OPTS) compiler/ghc.cabal compiler/ghc.cabal.old + "$(RM)" $(RM_OPTS) ghc/ghc-bin.cabal + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h + "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h + "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h + "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h + + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) maintainer-clean : distclean - $(RM) configure mk/config.h.in - $(RM) -r autom4te.cache libraries/*/autom4te.cache - $(RM) ghc.spec - $(RM) libraries/*/GNUmakefile libraries/*/ghc.mk libraries/*/configure - $(RM) libraries/base/include/HsBaseConfig.h.in - $(RM) libraries/directory/include/HsDirectoryConfig.h.in - $(RM) libraries/process/include/HsProcessConfig.h.in - $(RM) libraries/unix/include/HsUnixConfig.h.in - $(RM) libraries/old-time/include/HsTimeConfig.h.in + "$(RM)" $(RM_OPTS) configure mk/config.h.in + "$(RM)" $(RM_OPTS) -r autom4te.cache libraries/*/autom4te.cache + "$(RM)" $(RM_OPTS) ghc.spec + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/GNUmakefile, \ + $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/configure, \ + $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h.in + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h.in + "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h.in + "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h.in + "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h.in .PHONY: all_libraries +.PHONY: bootstrapping-files +bootstrapping-files: $(OTHER_LIBS) +bootstrapping-files: includes/ghcautoconf.h +bootstrapping-files: includes/DerivedConstants.h +bootstrapping-files: includes/GHCConstants.h + +.DELETE_ON_ERROR: +