X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=0e8a89791b3fd5446d7d6a2ac85a9fb92ae1d396;hb=2440b61a15e56f0cdee349c2574cdfc40adc6053;hp=b975f4956f2ec54f615ceb4e975b9e73b3ad2647;hpb=f34c33e7f3e0bcf916f96635c9b2e2ee186155b8;p=ghc-hetmet.git

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index b975f49..0e8a897 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -65,13 +65,13 @@ $(call all-target,$1_$2,$1/$2/package-data.mk)
 
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
 $(call build-package-data,$1,$2,$3)
 endif
 
 else
 
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
 $(call hs-sources,$1,$2)
 $(call c-sources,$1,$2)
 
@@ -96,12 +96,10 @@ $(call c-objs,$1,$2,v)
 $(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/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) | $$$$(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 $$@)
+$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) | $$$$(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
 
@@ -113,7 +111,7 @@ ifneq "$3" "0"
 ifeq "$$(ALL_STAGE1_LIBS)" ""
 $$(error ordering failure in $1: $$(ALL_STAGE1_LIBS) is empty)
 endif
-$1/$2/build/tmp/$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
+$1/$2/build/tmp/$$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
 endif
 endif
 
@@ -136,8 +134,7 @@ $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
 
 # INPLACE_BIN might be empty if we're distcleaning
 ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
-$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
-	"$$(MKDIRHIER)" $$(dir $$@)
+$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
 	"$$(CP)" -p $$< $$@
 	touch $$@
 endif