X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=46e90d943b0b88ad7c7a032488bf8c3568709fa1;hb=c2a12c10ea6b96da9916119a618653513af15a33;hp=56c1b7b3869d8957b973387ba7a8ffc2bd1ac2ba;hpb=8275817fa739644d332aea3871802905d45bfa63;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 56c1b7b..46e90d9 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -40,11 +40,24 @@ 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 :=
 
-ifeq "$(stage)" "1"
+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"
@@ -75,7 +88,7 @@ SUBDIRS += $(wildcard parallel)
 endif
 endif
 
-ifeq "$(stage)" "2"
+ifeq "$(DO_STAGE_2_LIBS)" "YES"
 ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
 SUBDIRS += dph/dph-base