Make sure we aren't passing -Werror in the CFLAGS for configure scripts

[ghc-hetmet.git] / rules / build-package.mk

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 711e56c..a25a3d2 100644 (file)
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -39,7 +39,7 @@ endif
 
 # We don't install things compiled by stage 0, so no need to put them
 # in the bindist.
-ifneq "$(BINDIST) $3" "YES 0"
+ifneq "$$(BINDIST) $3" "YES 0"
 
 $(call all-target,$1,all_$1_$2)
 $(call clean-target,$1,$2,$1/$2)
@@ -78,7 +78,7 @@ endif
 
 $(call all-target,$1_$2,$1/$2/package-data.mk)
 
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
 $(call build-package-data,$1,$2)
@@ -136,6 +136,9 @@ $(call c-objs,$1,$2,dyn)
 $(call c-suffix-rules,$1,$2,dyn,YES)
 endif
 
+$(call cmm-objs,$1,$2,v)
+$(call cmm-suffix-rules,$1,$2,v)
+
 # Now generate all the build rules for each way in this directory:
 $$(foreach way,$$($1_$2_WAYS),$$(eval $$(call build-package-way,$1,$2,$$(way),$3)))