X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rules%2Fbuild-prog.mk;h=8397f3fb73e9f77bb0724cbd004aaabe6e2f3f29;hb=b64ab38c23af457a190ae3c8fed752f20fd21ae7;hp=1a2256b17b4c3540ac4f6f559718e7038167a183;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 1a2256b..8397f3f 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -92,22 +92,22 @@ $(call hs-suffix-rules,$1,$2,v)
 $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
   $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,v,$$(dir))))
 
-$(call c-objs,$1,$2)
+$(call c-objs,$1,$2,v)
 $(call hs-objs,$1,$2,v)
 
-$1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_C_OBJS) $$($1_$2_S_OBJS) $$($1_$2_OTHER_OBJS)
+$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_C_OBJS) $$($1_$2_S_OBJS) $$($1_$2_OTHER_OBJS)
+	$$($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)
 
 # Note [lib-depends] if this program is built with stage1 or greater, we
-# need to depend on the libraries too.  NB. since $(ALL_LIBS) and
+# need to depend on the libraries too.  NB. since $(ALL_STAGE1_LIBS) and
 # $(ALL_RTS_LIBS) are not defined until after libraries/*/ghc.mk have
 # been included, this introduces an ordering dependency.
 ifneq "$3" "0"
-ifeq "$$(ALL_LIBS)" ""
-$$(error ordering failure in $1: $$(ALL_LIBS) is empty)
+ifeq "$$(ALL_STAGE1_LIBS)" ""
+$$(error ordering failure in $1: $$(ALL_STAGE1_LIBS) is empty)
 endif
-$1/$2/build/tmp/$($1_$2_PROG) : $$(ALL_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
+$1/$2/build/tmp/$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
 endif
 endif
 
@@ -128,10 +128,13 @@ endif
 $(call all-target,$1_$2,$$($1_$2_INPLACE))
 $(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 $$< $$@
 	touch $$@
+endif
 
 # touch is necessary; cp doesn't update the file time.
 endif