X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=46e90d943b0b88ad7c7a032488bf8c3568709fa1;hb=c2a12c10ea6b96da9916119a618653513af15a33;hp=928871a658719782e5f6657f7fa0488bb8395c94;hpb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 928871a..46e90d9 100644
--- 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,6 +85,11 @@ SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard parallel)
+endif
+endif
+
+ifeq "$(DO_STAGE_2_LIBS)" "YES"
+ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
 SUBDIRS += dph/dph-base
 SUBDIRS += dph/dph-prim-interface
@@ -74,6 +99,7 @@ SUBDIRS += dph/dph-seq
 SUBDIRS += dph/dph-par
 endif
 endif
+endif
 
 # -----------------------------------------------------------------------------
 
@@ -189,7 +215,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" \