X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=c735e5137a60410c1c6377a200e34af08e1b4355;hb=abda57697c42103c025902f54ba3afa6d6e22692;hp=7e2ce68471980edc2eb267ddee899221e5f00c1f;hpb=6b715274be0003cf94a5e8f46e3d0baca773452f;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 7e2ce68..c735e51 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -30,6 +30,7 @@
 
 define build-package
 $(call trace, build-package($1,$2,$3))
+$(call profStart, build-package($1,$2,$3))
 # $1 = dir
 # $2 = distdir
 # $3 = GHC stage to use (0 == bootstrapping compiler)
@@ -52,6 +53,7 @@ clean_$1_$2_config:
 ifneq "$$($1_$2_NOT_NEEDED)" "YES"
 $$(eval $$(call build-package-helper,$1,$2,$3))
 endif
+$(call profEnd, build-package($1,$2,$3))
 endef
 
 
@@ -76,51 +78,46 @@ endif
 $1_$2_WAYS_DASHED = $$(subst $$(space),,$$(patsubst %,-%,$$(strip $$($1_$2_WAYS))))
 $1_$2_depfile_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
 
-########################################
-ifeq "$$($1_$2_CONFIGURE_PHASE)" ""
-$$(error No configure phase for $1_$2)
-else ifeq "$$($1_$2_CONFIGURE_PHASE)" "$$(phase)"
-
-ifeq "$$(DEBUG)" "YES"
-$$(warning $1/$2 configure phase)
-endif
-
-ifneq "$$(BINDIST)" "YES"
 $(call build-package-data,$1,$2,$3)
-endif
-
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
+ifeq "$3" "0"
+include $1/$2/package-data.mk
+else ifeq "$(phase)" "final"
 include $1/$2/package-data.mk
 endif
-
-else ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_or_later)" "YES"
-
-ifeq "$$(DEBUG)" "YES"
-$$(warning $1/$2 build phase)
 endif
 
-ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
-include $1/$2/package-data.mk
-ifeq "$$($1_$2_VERSION)" ""
-$$(error No version for $1_$2 found)
+# We don't bother splitting the bootstrap packages (built with stage 0)
+ifeq "$$($1_$2_SplitObjs)" ""
+ifeq "$$(SplitObjs) $3" "YES 1"
+$1_$2_SplitObjs = YES
+else
+$1_$2_SplitObjs = NO
 endif
 endif
 
-$(call all-target,$1,all_$1_$2)
+$(call hs-sources,$1,$2)
+$(call c-sources,$1,$2)
+$(call includes-sources,$1,$2)
 
-else
+$(call dependencies,$1,$2,$3)
 
-ifeq "$$(DEBUG)" "YES"
-$$(warning $1/$2 disabled phase)
-endif
+# Now generate all the build rules for each way in this directory:
+$$(foreach way,$$($1_$2_WAYS),$$(eval \
+    $$(call c-objs,$1,$2,$$(way)) \
+    $$(call c-suffix-rules,$1,$2,$$(way),YES) \
+    $$(call cmm-objs,$1,$2,$$(way)) \
+    $$(call cmm-suffix-rules,$1,$2,$$(way)) \
+    $$(call build-package-way,$1,$2,$$(way),$3) \
+  ))
 
+# C and S files are possibly built the "dyn" way.
+ifeq "$$(BuildSharedLibs)" "YES"
+$(call c-objs,$1,$2,dyn)
+$(call c-suffix-rules,$1,$2,dyn,YES)
 endif
-########################################
-
-# 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)
 # This give us things like
 #     all_libraries: all_libraries/base_dist-install
 ifneq "$$($1_$2_GROUP)" ""
@@ -135,53 +132,13 @@ check_$1: $$(GHC_CABAL_INPLACE)
 	$$(GHC_CABAL_INPLACE) check $1
 endif
 
-ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES"
-
-$(call hs-sources,$1,$2)
-$(call c-sources,$1,$2)
-$(call includes-sources,$1,$2)
-
-# --- DEPENDENCIES
-
-$(call build-dependencies,$1,$2,$3)
-
-# --- BUILDING
-
-# We don't bother splitting the bootstrap packages (built with stage 0)
-ifeq "$$($1_$2_SplitObjs)" ""
-ifeq "$$(SplitObjs) $3" "YES 1"
-$1_$2_SplitObjs = YES
-else
-$1_$2_SplitObjs = NO
-endif
-endif
-
-# C and S files are possibly built the "dyn" way.
-ifeq "$$(BuildSharedLibs)" "YES"
-$(call c-objs,$1,$2,dyn)
-$(call c-suffix-rules,$1,$2,dyn,YES)
-endif
-
-# Now generate all the build rules for each way in this directory:
-$$(foreach way,$$($1_$2_WAYS),$$(eval \
-    $$(call c-objs,$1,$2,$$(way)) \
-	$$(call c-suffix-rules,$1,$2,$$(way),YES) \
-    $$(call cmm-objs,$1,$2,$$(way)) \
-    $$(call cmm-suffix-rules,$1,$2,$$(way)) \
-    $$(call build-package-way,$1,$2,$$(way),$3) \
-  ))
-
 $(call haddock,$1,$2)
 
-endif # package-data.mk exists
-
 # Don't put bootstrapping packages in the bindist
 ifneq "$3" "0"
 BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $1/$2/setup-config $1/LICENSE
 BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
 endif
 
-endif
-
 endef