X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=5a589f456f245cf6897febbe1e6fcc5d6c8a4e67;hb=7720e1503ee9b6ea2b949f95287a32b8d3361bb0;hp=817d32546fe571a75ea2bf23c8012c5db1ac7e8f;hpb=02416f002b7f78c3842a622f53e1ed0aa143a337;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 817d325..5a589f4 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -37,12 +37,33 @@ ifeq "$$(findstring $3,0 1 2)" ""
 $$(error $1/$2: stage argument to build-package should be 0, 1, or 2)
 endif
 
+$(call clean-target,$1,$2,$1/$2)
+
+distclean : clean_$1_$2_config
+
+maintainer-clean : distclean
+
+.PHONY: clean_$1_$2_config
+clean_$1_$2_config:
+	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
+	"$$(RM)" $$(RM_OPTS_REC) $1/autom4te.cache
+
+ifneq "$$($1_$2_NOT_NEEDED)" "YES"
+$$(eval $$(call build-package-helper,$1,$2,$3))
+endif
+endef
+
+
+define build-package-helper
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
+
 # We don't install things compiled by stage 0, so no need to put them
 # in the bindist.
 ifneq "$$(BINDIST) $3" "YES 0"
 
 $(call all-target,$1,all_$1_$2)
-$(call clean-target,$1,$2,$1/$2)
 # This give us things like
 #     all_libraries: all_libraries/base_dist-install
 ifneq "$$($1_$2_GROUP)" ""
@@ -57,24 +78,14 @@ check_$1: $$(GHC_CABAL_INPLACE)
 	$$(GHC_CABAL_INPLACE) check $1
 endif
 
-distclean : clean_$1_$2_config
-
-maintainer-clean : distclean
-
-.PHONY: clean_$1_$2_config
-clean_$1_$2_config:
-	"$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
-	"$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache
-
 # --- CONFIGURATION
 
-$1_$2_USE_BOOT_LIBS = YES
-$(call package-config,$1,$2,$3)
-
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
 include $1/$2/package-data.mk
 endif
 
+$(call package-config,$1,$2,$3)
+
 ifeq "$$($1_$2_DISABLE)" "YES"
 
 ifeq "$$(DEBUG)" "YES"
@@ -89,7 +100,7 @@ $(call all-target,$1_$2,$1/$2/package-data.mk)
 ifneq "$$(BINDIST)" "YES"
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
-$(call build-package-data,$1,$2)
+$(call build-package-data,$1,$2,$3)
 endif
 
 else
@@ -120,9 +131,9 @@ $(call includes-sources,$1,$2)
 # We must use a different dependency file if $(GhcLibWays) changes, so
 # encode the ways into the name of the file.
 $1_$2_WAYS_DASHED = $$(subst $$(space),,$$(patsubst %,-%,$$(strip $$($1_$2_WAYS))))
-$1_$2_depfile = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
+$1_$2_depfile_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
 
-$(call build-dependencies,$1,$2)
+$(call build-dependencies,$1,$2,$3)
 
 # --- BUILDING
 
@@ -136,7 +147,7 @@ endif
 endif
 
 # C and S files are possibly built the "dyn" way.
-ifeq "$(BuildSharedLibs)" "YES"
+ifeq "$$(BuildSharedLibs)" "YES"
 $(call c-objs,$1,$2,dyn)
 $(call c-suffix-rules,$1,$2,dyn,YES)
 endif