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/build-prog.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/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 1bb9028f3b..321de02241 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -99,12 +99,12 @@ $(call hs-objs,$1,$2,v) ifeq "$$(BootingFromHc)" "NO" $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) - $$(MKDIRHIER) $$(dir $$@) - $$($1_$2_HC) -o $$@ $$($1_$2_v_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) + "$$(MKDIRHIER)" $$(dir $$@) + "$$($1_$2_HC)" -o $$@ $$($1_$2_v_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) else $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) - $$(MKDIRHIER) $$(dir $$@) - $$(CC) -o $$@ $$($1_$2_v_ALL_CC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) $$($1_$2_v_EXTRA_CC_OPTS) + "$$(MKDIRHIER)" $$(dir $$@) + "$$(CC)" -o $$@ $$($1_$2_v_ALL_CC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) $$($1_$2_v_EXTRA_CC_OPTS) endif # Note [lib-depends] if this program is built with stage1 or greater, we @@ -139,8 +139,8 @@ $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE)) # INPLACE_BIN might be empty if we're distcleaning ifneq "$$(INPLACE_BIN)" "" $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER) - $$(MKDIRHIER) $$(dir $$@) - $$(CP) -p $$< $$@ + "$$(MKDIRHIER)" $$(dir $$@) + "$$(CP)" -p $$< $$@ touch $$@ endif |