projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /tmp/ghc-garrows; branch 'master' of http://git.megacz.com...
[ghc-hetmet.git]
/
rules
/
build-package.mk
diff --git
a/rules/build-package.mk
b/rules/build-package.mk
index
3f4cd93
..
ac0a8ee
100644
(file)
--- a/
rules/build-package.mk
+++ b/
rules/build-package.mk
@@
-30,6
+30,7
@@
define build-package
$(call trace, build-package($1,$2,$3))
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)
# $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
ifneq "$$($1_$2_NOT_NEEDED)" "YES"
$$(eval $$(call build-package-helper,$1,$2,$3))
endif
+$(call profEnd, build-package($1,$2,$3))
endef
endef
@@
-80,7
+82,7
@@
$(call build-package-data,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
ifeq "$3" "0"
include $1/$2/package-data.mk
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
ifeq "$3" "0"
include $1/$2/package-data.mk
-else ifeq "$(phase)" ""
+else ifeq "$(phase)" "final"
include $1/$2/package-data.mk
endif
endif
include $1/$2/package-data.mk
endif
endif
@@
-107,7
+109,7
@@
ifneq "$(phase)" "0"
# bootstrapping stuff
ifeq "$3" "0"
$(call include-dependencies,$1,$2,$3)
# bootstrapping stuff
ifeq "$3" "0"
$(call include-dependencies,$1,$2,$3)
-else ifeq "$(phase)" ""
+else ifeq "$(phase)" "final"
# In the final phase, we also include the dependency files for
# everything else
$(call include-dependencies,$1,$2,$3)
# In the final phase, we also include the dependency files for
# everything else
$(call include-dependencies,$1,$2,$3)