X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fc-suffix-rules.mk;h=fa7dd6f8405832dff2968717cc8b949cc49ecf33;hb=001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e;hp=f3e3ab6ca023da89f7899e904dd4ce5bee7fe4cc;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git

diff --git a/rules/c-suffix-rules.mk b/rules/c-suffix-rules.mk
index f3e3ab6..fa7dd6f 100644
--- a/rules/c-suffix-rules.mk
+++ b/rules/c-suffix-rules.mk
@@ -17,60 +17,49 @@ define c-suffix-rules
 # $3 = way
 # $4 = use GHC (YES/NO)
 
+ifneq "$$(BINDIST)" "YES"
+
 # UseGhcForCc is only relevant when not booting from HC files.
 ifeq "$4 $$(BootingFromHc)" "YES NO"
 
-$1/$2/build/%.$$($3_osuf) : $1/%.c $$(MKDIRHIER) $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.$$($3_osuf) : $1/%.c $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.c $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)s $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
 
-$1/$2/build/%.$$($3_osuf) : $1/%.S $$(MKDIRHIER) $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.$$($3_osuf) : $1/%.S $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_way_)s : $1/$2/build/%.c $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -S $$< -o $$@
 
 $1/$2/build/%.$$($3_way_)s : $1/%.c $$($1_$2_HC_DEP)
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$($1_$2_HC)" $$($1_$2_$3_GHC_CC_OPTS) -S $$< -o $$@
 
 else
 
-$1/$2/build/%.$$($3_osuf) : $1/%.c $$(MKDIRHIER)
-	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.$$($3_osuf) : $1/%.c | $$$$(dir $$$$@)/.
 	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.c
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)s
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(AS)" $$($1_$2_$3_ALL_AS_OPTS) -o $$@ $$<
 
-$1/$2/build/%.$$($3_osuf) : $1/%.S $$(MKDIRHIER)
-	"$$(RM)" $$(RM_OPTS) $$@
-	"$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.$$($3_osuf) : $1/%.S | $$$$(dir $$$$@)/.
 	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_way_)s : $1/$2/build/%.c
-	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -S $$< -o $$@
 
 endif
 
+endif
+
 endef