Don't compile Cabal with -cpp -fffi
[ghc-hetmet.git] / libraries / Makefile
index 20333b1..0ca6cdd 100644 (file)
@@ -74,9 +74,15 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
 SUBDIRS += $(wildcard parallel)
-SUBDIRS += $(wildcard ndp)
+SUBDIRS_BUILD += $(wildcard ndp)
+SUBDIRS_BUILD += $(wildcard dph/dph-base)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-par)
+SUBDIRS_BUILD += $(wildcard dph/dph)
 endif
 
+SUBDIRS += $(SUBDIRS_BUILD)
+
 # -----------------------------------------------------------------------------
 
 empty=
@@ -141,8 +147,7 @@ endif
 
 BOOTSTRAP_LIBS = Cabal filepath
 BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC = -DCABAL_VERSION=1,3 $(addprefix -i$(FPTOOLS_TOP_ABS)/libraries/bootstrapping.,$(BOOTSTRAP_LIBS))
 DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
                  $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
@@ -163,26 +168,28 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
+CABAL_GHC_FLAGS = -Wall
+
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
 %/setup/Setup: $(BOOTSTRAP_STAMPS)
        -$(RM) -rf $*/setup
        mkdir $*/setup
        $(CP) $*/Setup.*hs $*/setup
-       cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \
-                             $(BOOTSTRAP_INC_2_UP)
+       cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \
+                             $(BOOTSTRAP_INC)
 
 installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
        -$(RM) -rf installPackage
        mkdir installPackage
        $(CP) installPackage.hs installPackage/
 ifeq "$(stage)" "2"
-       cd installPackage && ../$(HC) -Wall -cpp \
+       cd installPackage && ../$(HC) $(CABAL_GHC_FLAGS) \
                                    --make installPackage -o installPackage \
-                                   $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS)
+                                   $(BOOTSTRAP_INC) $(DEPLOYMENT_OPTS)
 else
-       cd installPackage && $(GHC) -Wall -cpp \
+       cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \
                                    --make installPackage -o installPackage \
-                                   $(BOOTSTRAP_INC_1_UP)
+                                   $(BOOTSTRAP_INC)
 endif
 # TODO: The conditional is yucky, but we need to be able to build with stage1
 #       for bindists and as installPackages/ has no Makefile, it seems hard
@@ -199,6 +206,8 @@ else
        cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 endif
 
+IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/libraries/boot-packages
+
 $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
        $(RM) -rf bootstrapping.$*
        $(CP) -R $* bootstrapping.$*
@@ -247,28 +256,28 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)$(CONFIGURE_ARGS))
 
 ifeq "$(Windows)" "YES"
-NONEXISTANT=c:/NONEXISTANT
+NONEXISTENT=c:/NONEXISTENT
 else
-NONEXISTANT=/NONEXISTANT
+NONEXISTENT=/NONEXISTENT
 endif
 
 ALL_CONFIGURE_FLAGS = \
                   $(CONFIGURE_OPTS) \
-                  --prefix=$(NONEXISTANT) \
-                  --bindir=$(NONEXISTANT) \
-                  --libdir=$(NONEXISTANT) \
+                  --prefix=$(NONEXISTENT) \
+                  --bindir=$(NONEXISTENT) \
+                  --libdir=$(NONEXISTENT) \
                   --libsubdir='$$pkgid' \
-                  --libexecdir=$(NONEXISTANT) \
-                  --datadir=$(NONEXISTANT) \
-                  --docdir=$(NONEXISTANT) \
-                          --haddockdir=$(NONEXISTANT) \
-                  --htmldir=$(NONEXISTANT) \
-                  --with-compiler=../../compiler/stage1/ghc-inplace \
-                  --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
-                  --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
+                  --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) \
                   --haddock-options="--use-contents=../index.html \
-                                  --use-index=../doc-index.html" \
+                                     --use-index=../doc-index.html" \
                   $(FLAGGED_CONFIGURE_ARGS) \
                   --configure-option=--with-cc=$(CC)
 
@@ -276,6 +285,7 @@ $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
        -$(RM) -f stamp/configure.library.*.$* $*/unbuildable
+       $(MKDIRHIER) `dirname $@`
        ( cd $* && setup/Setup configure $(ALL_CONFIGURE_FLAGS) ) \
              && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
@@ -288,26 +298,35 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # needs to be done.  However, we're careful not to overwrite GNUmakefile
 # if it hasn't changed, so that dependency-generation isn't forced
 # every time.
-$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
+# Packages in $(SUBDIRS_BUILD) need to use the build.* rules instead of
+# 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).% \
                 %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
-       if ifBuildable/ifBuildable $*; then \
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
-         cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \
+         cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
          mv GNUmakefile GNUmakefile.tmp; \
          setup/Setup makefile -f GNUmakefile; \
          cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
          $(MAKE) $(MFLAGS) && \
-         ../installPackage/installPackage register --inplace; \
+         setup/Setup register --inplace; \
        fi
 
+MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local
+
+# Alternate rule, as described above
+$(foreach SUBDIR,$(SUBDIRS_BUILD),make.library.$(SUBDIR)):\
+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).% \
                  %/setup/Setup ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
          setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+         setup/Setup register --inplace; \
        fi
 
 .PHONY: doc html
@@ -325,14 +344,14 @@ endif
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+       if $(IFBUILDABLE) $*; then \
          cd $* && setup/Setup haddock --html-location='../$$pkg' \
                                       $(CABAL_HADDOCK_FLAGS); \
        fi
 ifneq "$(HSCOLOUR)" ""
 # We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer
 # mismatch
-       if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi
+       if $(IFBUILDABLE) $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 
 .PHONY: distclean clean clean.library.%
@@ -389,9 +408,9 @@ install-docs:
 
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
-         ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+         $(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)' ; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -413,7 +432,7 @@ endif
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
-       if ifBuildable/ifBuildable $*; then \
+       if $(IFBUILDABLE) $*; then \
          $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \
          cd $* && \
          cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \