projects / ghc-hetmet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it
[ghc-hetmet.git] / libraries / Makefile
diff --git a/libraries/Makefile b/libraries/Makefile
index 20161c9..65778ee 100644 (file)
--- 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)
@@ -70,9 +70,6 @@ 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)
@@ -146,22 +143,6 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-ifneq "$(HSCOLOUR)" ""
-CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR)
-endif
-
-ifneq "$(ALEX)" ""
-CONFIGURE_OPTS += --with-alex=$(ALEX)
-endif
-
-ifneq "$(HADDOCK)" ""
-CONFIGURE_OPTS += --with-haddock=$(HADDOCK)
-endif
-
-ifneq "$(HAPPY)" ""
-CONFIGURE_OPTS += --with-happy=$(HAPPY)
-endif
-
 DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
                   $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
@@ -173,14 +154,13 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
-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
 
 .PHONY: boot
 
@@ -192,13 +172,17 @@ cabal-bin: cabal-bin.hs
 bootstrapping.conf: cabal-bin
        echo "[]" > $@.tmp
        -cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
-       cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$(HERE_ABS)/$@.tmp
+       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) --package-db=$(HERE_ABS)/$@.tmp
+       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
@@ -251,15 +235,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
@@ -267,28 +242,15 @@ 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)): \
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
+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) ) \
@@ -307,7 +269,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
 # 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-bin ifBuildable/ifBuildable
+                cabal-bin ifBuildable/ifBuildable bootstrapping.conf
        if $(IFBUILDABLE) $*; then \
          cd $* && \
          cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
@@ -327,10 +289,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-bin 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
 
@@ -348,7 +310,7 @@ endif
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               cabal-bin ifBuildable/ifBuildable
+               cabal-bin ifBuildable/ifBuildable bootstrapping.conf
        if $(IFBUILDABLE) $*; then \
          cd $* && $(CABAL) haddock --html-location='../$$pkg' \
                                    $(CABAL_HADDOCK_FLAGS); \
@@ -366,6 +328,7 @@ 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 bootstrapping.conf     bootstrapping.conf.old
        $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)