diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-30 22:00:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-30 22:00:21 +0000 |
| commit | 0ef6ba7b28187a4bf5309f9702eeaf53a281204b (patch) | |
| tree | 653c84d5647c6efa71836dbd7a7231b2ae725988 /rules/c-suffix-rules.mk | |
| parent | d5629b335a3254612887be8091b76dbdf2b582f8 (diff) | |
| download | haskell-0ef6ba7b28187a4bf5309f9702eeaf53a281204b.tar.gz | |
Quote commands that we run, so they work if there are space in their paths
I've also added some missing $s to some makefiles. These aren't
technically necessary, but it's nice to be consistent.
Diffstat (limited to 'rules/c-suffix-rules.mk')
| -rw-r--r-- | rules/c-suffix-rules.mk | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/rules/c-suffix-rules.mk b/rules/c-suffix-rules.mk index 5134b6ab28..f3e3ab6ca0 100644 --- a/rules/c-suffix-rules.mk +++ b/rules/c-suffix-rules.mk @@ -21,54 +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) $$@ - $$($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 $$@ 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 |