X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=3631a90bf19dcd69b016a6b7d1e564803ecb0016;hb=e8842f6d21227fe800a495197be0d9f34aa862cc;hp=8397f3fb73e9f77bb0724cbd004aaabe6e2f3f29;hpb=cd12c32de77ac18a69ed1733a558095567ec5ba8;p=ghc-hetmet.git

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 8397f3f..3631a90 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 $$@)
-	$$($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 $$@)
+	"$$(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
@@ -118,8 +126,8 @@ else
 ifeq "$$($1_$2_SHELL_WRAPPER) $$(Windows)" "YES NO"
 $1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
 else
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-$1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+$1_$2_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG)
 else
 $1_$2_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
 endif
@@ -129,10 +137,10 @@ $(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)" ""
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(CP) -p $$< $$@
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(CP)" -p $$< $$@
 	touch $$@
 endif
 
@@ -142,8 +150,8 @@ endif
 $(call shell-wrapper,$1,$2)
 
 ifeq "$$($1_$2_INSTALL)" "YES"
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-INSTALL_LIBEXECS += $1/$2/build/tmp/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG)
 else
 INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG)
 endif