X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fhs-suffix-rules-srcdir.mk;fp=rules%2Fhs-suffix-rules-srcdir.mk;h=a08fac70e7b2547fa642362fcc111e73ab911722;hp=ceeede8e969e669e46dc780a69201e5a912ea330;hb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;hpb=d5629b335a3254612887be8091b76dbdf2b582f8

diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk
index ceeede8..a08fac7 100644
--- a/rules/hs-suffix-rules-srcdir.mk
+++ b/rules/hs-suffix-rules-srcdir.mk
@@ -19,35 +19,35 @@ define hs-suffix-rules-srcdir
 ifneq "$$(BootingFromHc)" "YES"
 
 $1/$2/build/%.hs : $1/$4/%.ly $$(MKDIRHIER)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
 
 $1/$2/build/%.hs : $1/$4/%.y $$(MKDIRHIER)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
 
 $1/$2/build/%.hs : $1/$4/%.x $$(MKDIRHIER)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(ALEX) $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(ALEX)" $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@
 
 $1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(HSC2HS_INPLACE) $$($1_$2_$3_ALL_HSC2HS_OPTS) $$< -o $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(HSC2HS_INPLACE)" $$($1_$2_$3_ALL_HSC2HS_OPTS) $$< -o $$@
 	touch $$(patsubst %.hsc,%_hsc.c,$$<)
 
 # Compiling Haskell source
 
 $1/$2/build/%.$$($3_osuf) : $1/$4/%.hs $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$4/%.lhs $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_hcsuf) : $1/$4/%.hs $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
 
 $1/$2/build/%.$$($3_hcsuf) : $1/$4/%.lhs $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
 
 endif
 
@@ -55,34 +55,34 @@ endif
 # .hs->.o rule, I don't know why --SDM
 
 $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h $$(MKDIRHIER)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h
-	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
 # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc
-# 	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+# 	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 #
 # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc
-# 	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+# 	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 #
 # $1/$2/build/%.$$($3_way_)s : $1/$2/build/%.$$($3_way_)hc
-# 	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -S $$< -o $$@
+# 	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -S $$< -o $$@
 
 # Now the rules for hs-boot files.
 
 $1/$2/build/%.hs-boot : $1/$4/%.hs-boot
-	$$(CP) $$< $$@
+	"$$(CP)" $$< $$@
 
 $1/$2/build/%.lhs-boot : $1/$4/%.lhs-boot
-	$$(CP) $$< $$@
+	"$$(CP)" $$< $$@
 
 $1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.hs-boot $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
 $1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.lhs-boot $$($1_$2_HC_DEP)
-	$$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
+	"$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
 ifneq "$$(BootingFromHc)" "YES"
 # stubs are automatically generated and compiled by GHC