X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=37debcd1cb056ed8c9d7c513b12c17fe1416b495;hb=2002bc3d77b9e601287cd0499c0f815ebc992ea0;hp=b58777db51cccd3db0c9d62ca4179a8bedd77f0b;hpb=efe7a8d4719fb2e6f53126d834dff2b6831ad662;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index b58777d..37debcd 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -37,6 +37,7 @@ show: # for paths and arguments to tools etc, and those set in mk/build.mk. TOP=.. include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/cabal-flags.mk SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring SUBDIRS += containers bytestring old-locale old-time filepath directory @@ -61,7 +62,6 @@ SUBDIRS += $(wildcard network) SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) -SUBDIRS += $(wildcard fgl) SUBDIRS += $(wildcard time) SUBDIRS += $(wildcard OpenGL) SUBDIRS += $(wildcard GLUT) @@ -146,10 +146,6 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif -ifneq "$(HSCOLOUR)" "" -CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR) -endif - DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) @@ -158,32 +154,40 @@ DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ subdirs: @echo $(SUBDIRS) -.PHONY: boot - -boot: ifBuildable/ifBuildable cabal-bin ghc-prim/Setup - HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages -CABAL=$(HERE_ABS)/cabal-bin +CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp endif -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 +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 -i$(HERE_ABS)/hpc -# 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 +.PHONY: boot + +boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf -# 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 +cabal-bin: cabal-bin.hs + $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin + +bootstrapping.conf: cabal-bin + echo "[]" > $@.tmp + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd filepath && $(CABAL) build --distpref=dist-bootstrapping + cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd Cabal && $(CABAL) build --distpref=dist-bootstrapping + cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping + cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd hpc && $(CABAL) build --distpref=dist-bootstrapping + cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace + mv $@.tmp $@ installPackage/installPackage: installPackage.hs -$(RM) -rf installPackage @@ -235,15 +239,6 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We put non-existant paths in when configuring, as we require that -# builds don't depend on these paths when making bindists. - -# We rely on all the CONFIGURE_ARGS being quoted with '...', and there -# being no 's inside the values. -FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ - $(space)--configure-option=',\ - $(space)$(CONFIGURE_ARGS)) - ifeq "$(Windows)" "YES" NONEXISTENT=c:/NONEXISTENT else @@ -251,24 +246,10 @@ NONEXISTENT=/NONEXISTENT endif ALL_CONFIGURE_FLAGS = \ - $(CONFIGURE_OPTS) \ - --prefix=$(NONEXISTENT) \ - --bindir=$(NONEXISTENT) \ - --libdir=$(NONEXISTENT) \ - --libsubdir='$$pkgid' \ - --libexecdir=$(NONEXISTENT) \ - --datadir=$(NONEXISTENT) \ - --docdir=$(NONEXISTENT) \ - --haddockdir=$(NONEXISTENT) \ - --htmldir=$(NONEXISTENT) \ - --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ - --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ - --with-hsc2hs=$(FPTOOLS_TOP_ABS)/utils/hsc2hs/hsc2hs-inplace \ - --with-ld=$(LD) \ + $(INSTALL_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ - $(FLAGGED_CONFIGURE_ARGS) \ - --configure-option=--with-cc=$(CC) + $(CONFIGURE_OPTS) $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ @@ -314,7 +295,7 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) build $(BUILD_FLAGS); \ $(CABAL) register --inplace; \ fi @@ -348,8 +329,13 @@ endif distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping $(RM) -rf bootstrapping/* - $(RM) -f cabal-bin + $(RM) -f bootstrapping.conf bootstrapping.conf.old + $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old + $(RM) -f cabal-bin cabal-bin.exe $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html