projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin'
[ghc-hetmet.git]
/
rules
/
build-prog.mk
diff --git
a/rules/build-prog.mk
b/rules/build-prog.mk
index
4c07ad6
..
5c352a2
100644
(file)
--- a/
rules/build-prog.mk
+++ b/
rules/build-prog.mk
@@
-21,6
+21,7
@@
define build-prog
$(call trace, build-prog($1,$2,$3))
define build-prog
$(call trace, build-prog($1,$2,$3))
+$(call profStart, build-prog($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)
@@
-40,6
+41,7
@@
$(call clean-target,$1,$2,$1/$2)
ifneq "$$($1_$2_NOT_NEEDED)" "YES"
$$(eval $$(call build-prog-helper,$1,$2,$3))
endif
ifneq "$$($1_$2_NOT_NEEDED)" "YES"
$$(eval $$(call build-prog-helper,$1,$2,$3))
endif
+$(call profEnd, build-prog($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
@@
-195,7
+197,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)