Fix SPARC build, missing #include

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 624427f..c32c1f6 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -36,9 +36,29 @@ TOP=..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal-flags.mk
 
+ifeq "$(stage)" ""
+stage := 1
+endif
+
+DO_STAGE_1_LIBS := NO
+DO_STAGE_2_LIBS := NO
+ifeq "$(stage)" "1"
+DO_STAGE_1_LIBS := YES
+endif
+ifeq "$(stage)" "2"
+DO_STAGE_2_LIBS := YES
+endif
+ifneq "$(filter install clean maintainer-clean distclean binary-dist,$(MAKECMDGOALS))" ""
+DO_STAGE_1_LIBS := YES
+DO_STAGE_2_LIBS := YES
+endif
+
 # Any libraries listed here should also be in ../packages
 
-SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
+SUBDIRS :=
+
+ifeq "$(DO_STAGE_1_LIBS)" "YES"
+SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -65,16 +85,30 @@ SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard parallel)
+endif
+endif
+
+DPH_SUBDIRS :=
+ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
-SUBDIRS += dph/dph-base
-SUBDIRS += dph/dph-prim-interface
-SUBDIRS += dph/dph-prim-seq
-SUBDIRS += dph/dph-prim-par
-SUBDIRS += dph/dph-seq
-SUBDIRS += dph/dph-par
+DPH_SUBDIRS += dph/dph-base
+DPH_SUBDIRS += dph/dph-prim-interface
+DPH_SUBDIRS += dph/dph-prim-seq
+DPH_SUBDIRS += dph/dph-prim-par
+DPH_SUBDIRS += dph/dph-seq
+DPH_SUBDIRS += dph/dph-par
 endif
 endif
 
+# We have a separate variable for cleaning as this happens in stage=1 and
+# we want to clean the dph subdirectories, too.
+ifeq "$(DO_STAGE_2_LIBS)" "YES"
+SUBDIRS       += $(DPH_SUBDIRS)
+CLEAN_SUBDIRS  = $(SUBDIRS)
+else
+CLEAN_SUBDIRS  = $(SUBDIRS) $(DPH_SUBDIRS)
+endif
+
 # -----------------------------------------------------------------------------
 
 empty=
@@ -116,9 +150,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 CABAL_GHC_FLAGS = -Wall
-ifeq "$(ghc_ge_605)" "NO"
-CABAL_GHC_FLAGS += -cpp
-endif
 
 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
 
@@ -173,6 +204,22 @@ rebuild.library.%: clean.library.% build.library.%
 $(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\
 remake.library.%: clean.library.% make.library.%
 
+# The meta package dph is a special case
+ifeq "$(stage)" "1"
+remake.library.dph:
+       @echo "*** Package dph needs to be made in stage=2"
+endif
+ifeq "$(stage)" "2"
+# NB. we're depending on make chasing dependencies from left to right here.
+# This bit goes wrong with 'make -j'.
+remake.library.dph: remake.library.dph/dph-base \
+               remake.library.dph/dph-prim-interface \
+               remake.library.dph/dph-prim-seq \
+               remake.library.dph/dph-prim-par \
+               remake.library.dph/dph-seq \
+               remake.library.dph/dph-par
+endif
+
 # 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))
@@ -188,7 +235,7 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 
 ALL_CONFIGURE_FLAGS = \
                $(INSTALL_DIRS_CONFIGURE_FLAGS) \
-               $(USE_STAGE1_CONFIGURE_FLAGS) \
+               $(USE_STAGE$(stage)_CONFIGURE_FLAGS) \
                $(COMMON_CONFIGURE_FLAGS) \
                   --haddock-options="--use-contents=../index.html \
                                      --use-index=../doc-index.html" \
@@ -233,6 +280,11 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
          $(CABAL) register --inplace; \
        fi
 
+# Special case for meta package dph: we can only remake it as we don't have
+# any dependency info between the sub-packages
+make.library.dph:
+       @echo "*** Please use the target 'remake.library.dph' instead"
+
 MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local
 
 # Build the library using 'setup build' (not the default)
@@ -256,7 +308,7 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
        sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
-ifneq "$(HSCOLOUR)" ""
+ifeq "$(HSCOLOUR_SRCS)" "YES"
 CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
 CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
@@ -282,7 +334,11 @@ endif
 maintainer-clean: clean
 distclean: clean
 
+ifeq "$(DPH_SUBDIRS)" ""
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+else
+clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) clean.library.dph
+endif
        -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping
        -cd filepath              && $(CABAL) clean --distpref=dist-bootstrapping
        -cd Cabal                 && $(CABAL) clean --distpref=dist-bootstrapping
@@ -295,14 +351,11 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -f libraries.txt index.html doc-index.html doc-index*.html
        $(RM) -f haddock* *.gif
        $(RM) -rf stamp/*
-ifneq "$(wildcard dph)" ""
-       $(MAKE) -C dph clean
-endif
 
 maintainer-clean distclean:
        $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
 
-$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
+$(foreach SUBDIR,$(CLEAN_SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
        $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && $(CABAL) clean
@@ -310,6 +363,13 @@ clean.library.%:
        $(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
+# Extra target to clean all the sub-packages of dph
+clean.library.dph: clean.library.dph/dph-prim-par \
+               clean.library.dph/dph-prim-seq \
+               clean.library.dph/dph-prim-interface \
+               clean.library.dph/dph-base
+       $(MAKE) -C dph clean
+
 # -----------------------------------------------------------------------------
 
 .PHONY: install install-docs install.library.%