X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=1bb9028f3b374b8417a3536b15dbcae1b8da2e03;hb=8aaa9ef471cadbc79fca58b234b198065f650dcf;hp=8f01e66b7bb060c0a8355272490d8d6364fae8d2;hpb=24adfcd0544942dff994b75f7dd5f72ab3e3d0f4;p=ghc-hetmet.git

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 8f01e66..1bb9028 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -24,9 +24,11 @@ define build-prog
 # $2 = distdir
 # $3 = GHC stage to use (0 == bootstrapping compiler)
 
+ifneq "$$(CLEANING)" "YES"
 ifeq "$$($1_$2_PROG)" ""
 $$(error $1_$2_PROG is not set)
 endif
+endif
 
 ifeq "$$(findstring $3,0 1 2)" ""
 $$(error $1/$2: stage argument to build-prog should be 0, 1, or 2)
@@ -95,9 +97,15 @@ $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
 $(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_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)
+endif
 
 # Note [lib-depends] if this program is built with stage1 or greater, we
 # need to depend on the libraries too.  NB. since $(ALL_STAGE1_LIBS) and
@@ -128,10 +136,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