Change how the libraries Makefile adds --configure-option= flags; fixes #1431

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 0ef78d8..1fef7e3 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -22,7 +22,7 @@
 
 .PHONY: default_target
 
-default_target: build
+default_target: all
 
 # make doesn't give us an easy way to get the libraries built in
 # dependency order the first time, but not rebuild base (for example)
@@ -117,7 +117,6 @@ subdirs:
 
 boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
          $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
-         $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile) \
          installPackage/installPackage
 
 # We build the Setup program in a setup subdirectory to stop it trying
@@ -168,6 +167,8 @@ endif
 $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
 rebuild.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))
 build: installPackage/installPackage
 
@@ -194,6 +195,12 @@ else
 libsubdir = $$compiler/lib/$$pkgid
 endif
 
+# 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))
+
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@ -203,14 +210,14 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
                   --prefix='$$topdir' \
                   --datadir='$$prefix/share' \
                   --libsubdir='$(libsubdir)' \
-                  --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
-                  --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
-                  --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
+                  --with-compiler=../../compiler/stage1/ghc-inplace$ \
+                  --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
+                  --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
                   --with-ld=$(LD) \
                   --datasubdir=ghc \
                   --haddock-args="--use-contents=../index.html \
                                   --use-index=../doc-index.html" \
-                  $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+                  $(FLAGGED_CONFIGURE_ARGS) \
                   --configure-option=--with-cc=$(CC) ) \
              && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
@@ -267,6 +274,7 @@ clean.library.%:
        $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && setup/Setup clean
        $(RM) -rf $*/setup
+       $(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
 # -----------------------------------------------------------------------------