X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=c1ce1f8dd9db8c7ed332f94a47c0ab9c51f760d3;hp=16fe934a3a95fe0904a18771c2e2cc01de1bace9;hb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;hpb=027caa7f6b842751f12c1d08e90bde91a0e38a5a diff --git a/Makefile b/Makefile index 16fe934..c1ce1f8 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ endif SUBDIRS = gmp libffi includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc -check-all: check-packages +check-all: check-packages check-tools # Sanity check that all the boot libraries are in the tree, to catch # failure to run darcs-all. @@ -93,6 +93,14 @@ check-packages : exit 1; \ fi +check-tools: +ifeq "$(HSCOLOUR_SRCS) $(HSCOLOUR)" "YES " + @echo "HsColour needed but wasn't found." + @echo "Set HSCOLOUR_SRCS=NO if you don't want to use it" + exit 1 +endif + @: + ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ifneq "$(WhatGccIsCalled)" "" GCC_LIB_DEP = stamp.inplace-gcc-lib @@ -102,7 +110,6 @@ endif stage1 : $(GCC_LIB_DEP) check-all $(MAKE) -C libraries boot $(MAKE) -C gmp all - $(MAKE) -C libffi all $(MAKE) -C utils/mkdependC boot $(MAKE) -C utils with-bootstrapping-compiler @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ @@ -122,6 +129,7 @@ stage1 : $(GCC_LIB_DEP) check-all $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \ if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ done + $(MAKE) -C libffi all $(MAKE) -C rts boot $(MAKE) -C rts $(MAKE) -C libraries all @@ -296,8 +304,8 @@ binary-dist :: tar-binary-dist .PHONY: tar-binary-dist tar-binary-dist: - ( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) ) - ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) ) + ( cd $(BIN_DIST_TOPDIR_ABS); $(TAR) cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) ) + ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | $(TAR) tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) ) else @@ -336,6 +344,7 @@ binary-dist:: $(MAKE) -C driver binary-dist WHERE_AM_I=$(WHERE_AM_I)/driver $(MAKE) -C utils binary-dist WHERE_AM_I=$(WHERE_AM_I)/utils $(MAKE) -C docs binary-dist WHERE_AM_I=$(WHERE_AM_I)/docs + $(MAKE) -C libffi binary-dist WHERE_AM_I=$(WHERE_AM_I)/libffi $(MAKE) -C libraries binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries $(MAKE) -C libraries/Cabal/doc binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries/Cabal/doc # Now thinks get messier. Some files we need to move around, rename or @@ -392,10 +401,10 @@ endif ln -s . $(BIN_DIST_NAME) # 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 $(BIN_DIST_TAR) -T $(BIN_DIST_LIST) - cd $(BIN_DIST_PREP_DIR) && tar rf $(BIN_DIST_TAR) $(BIN_DIST_NAME) + $(TAR) hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST) + cd $(BIN_DIST_PREP_DIR) && $(TAR) rf $(BIN_DIST_TAR) $(BIN_DIST_NAME) bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2) - tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion) + $(TAR) tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion) endif PUBLISH_FILES = $(BIN_DIST_TAR_BZ2) @@ -512,7 +521,7 @@ SRC_DIST_FILES += \ # - remove a bunch of other files that we know shouldn't be in the dist # - tar up first the extralibs package, then the main source package -EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages)) +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 @@ -561,9 +570,9 @@ dist :: && $(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" \) -print | xargs $(RM) -rf \ ) - tar chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL) + $(TAR) chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL) $(RM) -rf $(EXTRA_LIBS) - tar chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL) + $(TAR) chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL) # Upload the distribution(s) # Retrying is to work around buggy firewalls that corrupt large file transfers @@ -572,11 +581,11 @@ ifneq "$(PublishLocation)" "" dist :: @for i in 0 1 2 3 4 5 6 7 8 9; do \ echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \ - if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\ + if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi; \ done @for i in 0 1 2 3 4 5 6 7 8 9; do \ echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \ - if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\ + if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \ done endif @@ -605,7 +614,7 @@ hc-file-bundle : echo ghc-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go echo ghc-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go echo ghc-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go - tar czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go` + $(TAR) czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go` # ----------------------------------------------------------------------------- # Cleaning