X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=74ffbbd925616109cdb1aa979fe8b2ccd9bb67fa;hb=e222292914f36f4e42c123a380508f570d5a5f46;hp=ab73ebeefb756620896c0d185f6bb0067cf0f5d6;hpb=29c7945166be73aa70453d14dc2a334d16a434f2;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index ab73ebe..74ffbbd 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
 
 
@@ -64,67 +66,6 @@ define build-package-helper
 
 $(call package-config,$1,$2,$3)
 
-########################################
-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"
-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)
-endif
-endif
-
-$(call all-target,$1,all_$1_$2)
-
-else
-
-ifeq "$$(DEBUG)" "YES"
-$$(warning $1/$2 disabled phase)
-endif
-
-endif
-########################################
-
-# We don't install things compiled by stage 0, so no need to put them
-# in the bindist.
-ifneq "$$(BINDIST) $3" "YES 0"
-
-# This give us things like
-#     all_libraries: all_libraries/base_dist-install
-ifneq "$$($1_$2_GROUP)" ""
-all_$$($1_$2_GROUP): all_$1_$2
-endif
-
-ifneq "$$(CHECKED_$1)" "YES"
-CHECKED_$1 = YES
-check_packages: check_$1
-.PHONY: check_$1
-check_$1: $$(GHC_CABAL_INPLACE)
-	$$(GHC_CABAL_INPLACE) check $1
-endif
-
-ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES"
-
 # Bootstrapping libs are only built one way
 ifeq "$3" "0"
 $1_$2_WAYS = v
@@ -132,20 +73,19 @@ else
 $1_$2_WAYS = $$(GhcLibWays)
 endif
 
-$(call hs-sources,$1,$2)
-$(call c-sources,$1,$2)
-$(call includes-sources,$1,$2)
-
-# --- DEPENDENCIES
-
 # 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_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
 
-$(call build-dependencies,$1,$2,$3)
-
-# --- BUILDING
+$(call build-package-data,$1,$2,$3)
+ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
+ifeq "$3" "0"
+include $1/$2/package-data.mk
+else ifeq "$(phase)" ""
+include $1/$2/package-data.mk
+endif
+endif
 
 # We don't bother splitting the bootstrap packages (built with stage 0)
 ifeq "$$($1_$2_SplitObjs)" ""
@@ -156,24 +96,57 @@ $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)
+$(call hs-sources,$1,$2)
+$(call c-sources,$1,$2)
+$(call includes-sources,$1,$2)
+
+# --- DEPENDENCIES
+# We always have the dependency rules available, as we need to know
+# how to build hsc2hs's dependency file in phase 0
+$(call build-dependencies,$1,$2,$3)
+ifneq "$(phase)" "0"
+# From phase 1 we actually include the dependency files for the
+# bootstrapping stuff
+ifeq "$3" "0"
+$(call include-dependencies,$1,$2,$3)
+else ifeq "$(phase)" ""
+# In the final phase, we also include the dependency files for
+# everything else
+$(call include-dependencies,$1,$2,$3)
+endif
 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 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)
+# 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
 
-endif # package-data.mk exists
+$(call all-target,$1,all_$1_$2)
+# This give us things like
+#     all_libraries: all_libraries/base_dist-install
+ifneq "$$($1_$2_GROUP)" ""
+all_$$($1_$2_GROUP): all_$1_$2
+endif
+
+ifneq "$$(CHECKED_$1)" "YES"
+CHECKED_$1 = YES
+check_packages: check_$1
+.PHONY: check_$1
+check_$1: $$(GHC_CABAL_INPLACE)
+	$$(GHC_CABAL_INPLACE) check $1
+endif
+
+$(call haddock,$1,$2)
 
 # Don't put bootstrapping packages in the bindist
 ifneq "$3" "0"
@@ -181,7 +154,5 @@ BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $1/$2/setup-config $1/L
 BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
 endif
 
-endif
-
 endef