X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=b58777db51cccd3db0c9d62ca4179a8bedd77f0b;hb=efe7a8d4719fb2e6f53126d834dff2b6831ad662;hp=9b5c7dea48783d06e2bd42e22ea5dc676431e342;hpb=20d0ce2f990864da1a8330c363c9bfd7afa69dbd;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 9b5c7de..b58777d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -75,6 +75,11 @@ SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) SUBDIRS_BUILD += $(wildcard ndp) +SUBDIRS_BUILD += $(wildcard dph/dph-base) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-par) +SUBDIRS_BUILD += $(wildcard dph/dph) endif SUBDIRS += $(SUBDIRS_BUILD) @@ -86,6 +91,10 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +ifeq "$(ghc_ge_609)" "YES" +GhcLibHcOpts += -fno-warn-deprecated-flags +endif + ifeq "$(RelocatableBuild)" "YES" # On Windows we want to make moveable bindists, but we need to tell # ghc-pkg where the haddock docs are. Therefore we completely ignore @@ -141,11 +150,8 @@ ifneq "$(HSCOLOUR)" "" CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR) endif -BOOTSTRAP_LIBS = Cabal filepath -BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC = -DCABAL_VERSION=1,3 $(addprefix -i$(FPTOOLS_TOP_ABS)/libraries/bootstrapping.,$(BOOTSTRAP_LIBS)) DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ - $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) + $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) .PHONY: subdirs @@ -154,43 +160,38 @@ subdirs: .PHONY: boot -boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \ - $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \ - installPackage/installPackage +boot: ifBuildable/ifBuildable cabal-bin ghc-prim/Setup + +HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -# We build the Setup program in a setup subdirectory to stop it trying -# to use bits of base and Cabal when we build those packages. -# This also makes it slightly easier to clean. +IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages +CABAL=$(HERE_ABS)/cabal-bin + +CABAL_GHC_FLAGS = -Wall +ifeq "$(ghc_ge_605)" "NO" +CABAL_GHC_FLAGS += -cpp +endif -# We ought to be depending on %/Setup.*hs, but make makes that difficult. +BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -# -fffi is only needed for GHC 6.4 at the time of writing -CABAL_GHC_FLAGS = -Wall -cpp -fffi +# We use -main-is so that GHC doesn't get confused and think +# Main.hi/Main.o from cabal belongs to ghc-prim/Setup, or vice-versa. +cabal-bin: cabal-bin.hs + $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin -main-is Cabal -$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ -%/setup/Setup: $(BOOTSTRAP_STAMPS) - -$(RM) -rf $*/setup - mkdir $*/setup - $(CP) $*/Setup.*hs $*/setup - cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \ - $(BOOTSTRAP_INC) +# ghc-prim/Setup doesn't really depend on cabal-bin, but pretending that it +# does sequentialises building the two of them, which is nice given +# they're sharing -odir and -hidir. +ghc-prim/Setup: ghc-prim/Setup.hs cabal-bin + cd ghc-prim && $(GHC) $(BOOTSTRAPPING_FLAGS) --make Setup -o Setup -installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS) +installPackage/installPackage: installPackage.hs -$(RM) -rf installPackage mkdir installPackage $(CP) installPackage.hs installPackage/ -ifeq "$(stage)" "2" - cd installPackage && ../$(HC) $(CABAL_GHC_FLAGS) \ - --make installPackage -o installPackage \ - $(BOOTSTRAP_INC) $(DEPLOYMENT_OPTS) -else - cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \ - --make installPackage -o installPackage \ - $(BOOTSTRAP_INC) -endif -# TODO: The conditional is yucky, but we need to be able to build with stage1 -# for bindists and as installPackages/ has no Makefile, it seems hard -# to make this nicer. + cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ + --make installPackage -o installPackage \ + $(DEPLOYMENT_OPTS) ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable @@ -203,15 +204,6 @@ else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable endif -IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/libraries/boot-packages - -$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: - $(RM) -rf bootstrapping.$* - $(CP) -R $* bootstrapping.$* - $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \ - -exec $(RM) -f {} \; - touch $@ - .PHONY: all build configure all: build @@ -231,8 +223,8 @@ remake.library.%: clean.library.% make.library.% # NB. we're depending on make chasing dependencies from left to right here. # This bit goes wrong with 'make -j'. -build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) -build: installPackage/installPackage +build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) \ + installPackage/installPackage configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -280,10 +272,10 @@ ALL_CONFIGURE_FLAGS = \ $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin -$(RM) -f stamp/configure.library.*.$* $*/unbuildable $(MKDIRHIER) `dirname $@` - ( cd $* && setup/Setup configure $(ALL_CONFIGURE_FLAGS) ) \ + ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try # configuring it next time round, rather than assuming it'll still fail. @@ -299,15 +291,15 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # make.*, so filter them out and use an alternate rule below instead. $(foreach SUBDIR,$(filter-out $(SUBDIRS_BUILD),$(SUBDIRS)),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \ mv GNUmakefile GNUmakefile.tmp; \ - setup/Setup makefile -f GNUmakefile; \ + $(CABAL) makefile -f GNUmakefile; \ cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \ $(MAKE) $(MFLAGS) && \ - setup/Setup register --inplace; \ + $(CABAL) register --inplace; \ fi MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local @@ -319,11 +311,11 @@ make.library.%: build.library.% # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ - setup/Setup register --inplace; \ + $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) register --inplace; \ fi .PHONY: doc html @@ -340,10 +332,10 @@ endif $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ - cd $* && setup/Setup haddock --html-location='../$$pkg' \ - $(CABAL_HADDOCK_FLAGS); \ + cd $* && $(CABAL) haddock --html-location='../$$pkg' \ + $(CABAL_HADDOCK_FLAGS); \ fi ifneq "$(HSCOLOUR)" "" # We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer @@ -356,8 +348,8 @@ endif distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - $(RM) -f stamp/bootstrapping.* - $(RM) -rf bootstrapping.* + $(RM) -rf bootstrapping/* + $(RM) -f cabal-bin $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html @@ -369,8 +361,8 @@ distclean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable - -cd $* && setup/Setup clean - $(RM) -rf $*/setup + -cd $* && $(CABAL) clean + $(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o $(RM) $*/GNUmakefile $*/Makefile.local endif @@ -414,7 +406,8 @@ install.library.%: installPackage/installPackage ifBuildable/ifBuildable BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) +binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \ + installPackage/installPackage mkdir $(BIN_DIST_LIBDIR)/installPackage cp installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage mkdir $(BIN_DIST_LIBDIR)/ifBuildable