Allow ProjectTags to be specified in mk/build.mk

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index e0ecc62..ff20ce3 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -12,8 +12,7 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 endif
 
-SUBDIRS = base filepath haskell98 template-haskell readline \
-         regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -25,6 +24,10 @@ endif
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)
 SUBDIRS += $(wildcard haskell-src)
 SUBDIRS += $(wildcard html)
 SUBDIRS += $(wildcard network)
@@ -95,7 +98,7 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
        -$(RM) -rf $*/setup
        mkdir $*/setup
        $(CP) $*/Setup.*hs $*/setup
-       cd $*/setup && $(GHC) --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup
+       cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup
 
 stamp/$(BOOTSTRAPPING_CABAL):
        $(RM) -rf $(BOOTSTRAPPING_CABAL)