X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=8e0e665e18934c2587b15944352a2f81114ee328;hb=39b529c5fa4138cd359be1f1c5c9c6bdfacd6770;hp=70aea21cbf08445437fe189296614ab3538e66aa;hpb=990faa74e434b1ab5578b36220a336c24cff834b;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 70aea21..8e0e665 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -37,6 +37,9 @@ 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 + +# Any libraries listed here should also be in ../packages SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring SUBDIRS += containers bytestring old-locale old-time filepath directory @@ -61,21 +64,12 @@ SUBDIRS += $(wildcard network) SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) -SUBDIRS += $(wildcard fgl) SUBDIRS += $(wildcard time) -SUBDIRS += $(wildcard OpenGL) -SUBDIRS += $(wildcard GLUT) -SUBDIRS += $(wildcard OpenAL) -SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) -SUBDIRS += $(wildcard cgi) -ifeq "$(GhcLibsWithObjectIO)" "YES" -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) @@ -135,7 +129,7 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif -ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" "" +ifeq "$(BuildSharedLibs)" "YES" CONFIGURE_OPTS += --enable-shared CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared endif @@ -145,60 +139,54 @@ 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)) - .PHONY: subdirs subdirs: @echo $(SUBDIRS) -.PHONY: boot - -boot: ifBuildable/ifBuildable cabal ghc-prim/Setup - HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages -CABAL=$(HERE_ABS)/cabal +IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages 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 bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath +# Euch, hideous hack: +CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') -# 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: cabal.hs - $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal -o cabal -main-is Cabal +BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc -# ghc-prim/Setup doesn't really depend on cabal, 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 - cd ghc-prim && $(GHC) $(BOOTSTRAPPING_FLAGS) --make Setup -o Setup +.PHONY: boot -installPackage/installPackage: installPackage.hs - -$(RM) -rf installPackage - mkdir installPackage - $(CP) installPackage.hs installPackage/ - cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ - --make installPackage -o installPackage \ - $(DEPLOYMENT_OPTS) +boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf + +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 $@ ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ ifeq "$(stage)" "2" - cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \ - $(DEPLOYMENT_OPTS) + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable endif @@ -222,8 +210,7 @@ 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)) \ - installPackage/installPackage +build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -234,44 +221,18 @@ 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 -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_DIRS_CONFIGURE_FLAGS) \ + $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(COMMON_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)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ + bootstrapping.conf -$(RM) -f stamp/configure.library.*.$* $*/unbuildable $(MKDIRHIER) `dirname $@` ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \ @@ -290,7 +251,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal # 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).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable bootstrapping.conf if $(IFBUILDABLE) $*; then \ cd $* && \ cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \ @@ -310,10 +271,10 @@ 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).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable bootstrapping.conf if $(IFBUILDABLE) $*; then \ cd $* && \ - $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) build $(BUILD_FLAGS); \ $(CABAL) register --inplace; \ fi @@ -331,7 +292,7 @@ endif $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable bootstrapping.conf if $(IFBUILDABLE) $*; then \ cd $* && $(CABAL) haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ @@ -347,10 +308,14 @@ 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 + $(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 $(RM) -f haddock* *.gif @@ -395,20 +360,17 @@ install-docs: # overridden when installing a bindist. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ -install.library.%: installPackage/installPackage ifBuildable/ifBuildable +install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(FPTOOLS_TOP_ABS)/libraries/installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \ - installPackage/installPackage - mkdir $(BIN_DIST_LIBDIR)/installPackage - cp installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage +binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) mkdir $(BIN_DIST_LIBDIR)/ifBuildable cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable cp Makefile $(BIN_DIST_LIBDIR)