projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure all the clean rules are always included
[ghc-hetmet.git]
/
rules
/
build-prog.mk
diff --git
a/rules/build-prog.mk
b/rules/build-prog.mk
index
0e8a897
..
ebc8990
100644
(file)
--- a/
rules/build-prog.mk
+++ b/
rules/build-prog.mk
@@
-34,10
+34,21
@@
ifeq "$$(findstring $3,0 1 2)" ""
$$(error $1/$2: stage argument to build-prog should be 0, 1, or 2)
endif
$$(error $1/$2: stage argument to build-prog should be 0, 1, or 2)
endif
-$(call all-target,$1,all_$1_$2)
-
$(call clean-target,$1,$2,$1/$2)
$(call clean-target,$1,$2,$1/$2)
+ifneq "$$($1_$2_NOT_NEEDED)" "YES"
+$$(eval $$(call build-prog-helper,$1,$2,$3))
+endif
+endef
+
+
+define build-prog-helper
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
+
+$(call all-target,$1,all_$1_$2)
+
$(call package-config,$1,$2,$3)
ifeq "$$($1_USES_CABAL)" "YES"
$(call package-config,$1,$2,$3)
ifeq "$$($1_USES_CABAL)" "YES"
@@
-72,12
+83,14
@@
endif
else
ifneq "$$(BINDIST)" "YES"
else
ifneq "$$(BINDIST)" "YES"
+$1_$2_WAYS = v
+
$(call hs-sources,$1,$2)
$(call c-sources,$1,$2)
# --- DEPENDENCIES
$(call hs-sources,$1,$2)
$(call c-sources,$1,$2)
# --- DEPENDENCIES
-$1_$2_depfile = $1/$2/build/.depend
+$1_$2_depfile_base = $1/$2/build/.depend
$(call build-dependencies,$1,$2)
$(call build-dependencies,$1,$2)