X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=fe894364572fac0f5c6c9bce51836bf96c2d365f;hp=ff20ce385f5683705a8eed9b3be469e2b787b6a9;hb=1f4784a9ee5d38364aa7f0d8f91a22069b73a6ae;hpb=ab272eb88f58835d4ad6293813b88d2d6acc23c9 diff --git a/libraries/Makefile b/libraries/Makefile index ff20ce3..fe89436 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -82,7 +82,8 @@ subdirs: .PHONY: boot -boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) +boot: ifBuildable/ifBuildable \ + $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) # XXX Hideous hacks: $(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs $(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs @@ -100,6 +101,13 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ $(CP) $*/Setup.*hs $*/setup cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup +ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL) + -$(RM) -rf ifBuildable + mkdir ifBuildable + $(CP) ifBuildable.hs ifBuildable/ + cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \ + ifBuildable -o ifBuildable + stamp/$(BOOTSTRAPPING_CABAL): $(RM) -rf $(BOOTSTRAPPING_CABAL) $(CP) -R Cabal $(BOOTSTRAPPING_CABAL) @@ -143,8 +151,9 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup - cd $* && setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)) - cd $* && setup/Setup register --inplace + cd $* && ../ifBuildable/ifBuildable setup/Setup build \ + $(addprefix --ghc-option=,$(GhcLibHcOpts)) + cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace .PHONY: doc @@ -180,22 +189,24 @@ install-docs: $(foreach SUBDIR,$(SUBDIRS),stamp/configure.library.install.$(SUBDIR)): \ stamp/configure.library.install.%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* - cd $* && setup/Setup configure $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --with-compiler=$(bindir)/ghc \ - --datasubdir=ghc + cd $* && ../ifBuildable/ifBuildable setup/Setup configure \ + $(CONFIGURE_OPTS) \ + --prefix=$(prefix) \ + --with-compiler=$(bindir)/ghc \ + --datasubdir=ghc touch $@ # We need to reconfigure as we now need to register with the normal ghc-pkg $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: stamp/configure.library.install.% %/setup/Setup - cd $* && setup/Setup install + cd $* && ../ifBuildable/ifBuildable setup/Setup install .PHONY: clean clean.library.% clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f stamp/$(BOOTSTRAPPING_CABAL) $(RM) -rf $(BOOTSTRAPPING_CABAL) + $(RM) -rf ifBuildable $(RM) -f libraries.txt index.html doc-index.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \