X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fc-suffix-rules.mk;h=f3e3ab6ca023da89f7899e904dd4ce5bee7fe4cc;hb=340fb6fe7e6d31f73e8610d7f6fa3984555470fb;hp=089ff46a04dfa79f12c4c08dd93c26328451bf41;hpb=b426d31f065c4f60352bbc8c59d0235e85ffbcc6;p=ghc-hetmet.git

diff --git a/rules/c-suffix-rules.mk b/rules/c-suffix-rules.mk
index 089ff46..f3e3ab6 100644
--- a/rules/c-suffix-rules.mk
+++ b/rules/c-suffix-rules.mk
@@ -21,50 +21,54 @@ define c-suffix-rules
 ifeq "$4 $$(BootingFromHc)" "YES NO"
 
 $1/$2/build/%.$$($3_osuf) : $1/%.c $$(MKDIRHIER) $$($1_$2_HC_DEP)
-	$$(RM) $$@
-	$$(MKDIRHIER) $$(dir $$@)
-	$$($1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(MKDIRHIER)" $$(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) $$@
-	$$($1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
+	"$$(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) $$@
-	$$($1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
+	"$$(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) $$@
-	$$(MKDIRHIER) $$(dir $$@)
-	$$($1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(MKDIRHIER)" $$(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) $$@
-	$$($1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -S $$< -o $$@
+	"$$(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) $$@
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.c
-	$$(RM) $$@
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)s
-	$$(RM) $$@
-	$$(AS) $$($1_$2_$3_ALL_AS_OPTS) -o $$@ $$<
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(AS)" $$($1_$2_$3_ALL_AS_OPTS) -o $$@ $$<
 
 $1/$2/build/%.$$($3_osuf) : $1/%.S $$(MKDIRHIER)
-	$$(RM) $$@
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_way_)s : $1/$2/build/%.c
-	$$(RM) $$@
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -S $$< -o $$@
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -S $$< -o $$@
 
 endif