X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=fe894364572fac0f5c6c9bce51836bf96c2d365f;hb=1f4784a9ee5d38364aa7f0d8f91a22069b73a6ae;hp=82cf02e979269d90c66b9b55319444e0aa988002;hpb=0d126b9c0dc9299a860fc6bb0e1dee05eb583de2;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 82cf02e..fe89436 100644
--- 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)
@@ -56,6 +59,12 @@ endif
 empty=
 space=$(empty) $(empty)
 
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
 CONFIGURE_OPTS =
 CONFIGURE_STAMP_EXTRAS :=
 
@@ -73,7 +82,8 @@ subdirs:
 
 .PHONY: boot
 
-boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
+boot: ifBuildable/ifBuildable \
+	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
 	# XXX Hideous hacks:
 	$(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs
 	$(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs
@@ -89,11 +99,18 @@ $(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
+
+ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL)
+	-$(RM) -rf ifBuildable
+	mkdir ifBuildable
+	$(CP) ifBuildable.hs ifBuildable/
+	cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \
+	                         ifBuildable -o ifBuildable
 
 stamp/$(BOOTSTRAPPING_CABAL):
 	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(CP) -a Cabal $(BOOTSTRAPPING_CABAL)
+	$(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
 	$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
 	touch $@
 
@@ -122,17 +139,21 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	cd $* && setup/Setup configure \
 	                     $(CONFIGURE_OPTS) \
 	                     --prefix=$(prefix) \
-	                     --with-compiler=../../compiler/ghc-inplace \
-	                     --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
+	                     --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-ld=$(LD) \
 	                     --datasubdir=ghc \
-						 --haddock-args="--use-contents=../index.html --use-index=../doc-index.html"
+	                     --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+	                     --configure-option=--with-cc=$(CC)
 	touch $@
 
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup
-	cd $* && setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts))
-	cd $* && setup/Setup register --inplace
+	cd $* && ../ifBuildable/ifBuildable setup/Setup build \
+	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
+	cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace
 
 .PHONY: doc
 
@@ -168,22 +189,24 @@ install-docs:
 $(foreach SUBDIR,$(SUBDIRS),stamp/configure.library.install.$(SUBDIR)): \
 stamp/configure.library.install.%: %/setup/Setup
 	-$(RM) -f stamp/configure.library.*.$*
-	cd $* && setup/Setup configure $(CONFIGURE_OPTS) \
-	                               --prefix=$(prefix) \
-	                               --with-compiler=$(bindir)/ghc \
-	                               --datasubdir=ghc
+	cd $* && ../ifBuildable/ifBuildable setup/Setup configure \
+	                                    $(CONFIGURE_OPTS) \
+	                                    --prefix=$(prefix) \
+	                                    --with-compiler=$(bindir)/ghc \
+	                                    --datasubdir=ghc
 	touch $@
 
 # We need to reconfigure as we now need to register with the normal ghc-pkg
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: stamp/configure.library.install.% %/setup/Setup
-	cd $* && setup/Setup install
+	cd $* && ../ifBuildable/ifBuildable setup/Setup install
 
 .PHONY: clean clean.library.%
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)
 	$(RM) -rf $(BOOTSTRAPPING_CABAL)
+	$(RM) -rf ifBuildable
 	$(RM) -f libraries.txt index.html doc-index.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \