micro-opt: replace stmGetEnclosingTRec() with a field access

[ghc-hetmet.git] / rules / build-prog.mk

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 8397f3f..0a801af 100644 (file)
--- 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)
@@ -64,7 +66,7 @@ $(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"
-$(call build-package-data,$1,$2)
+$(call build-package-data,$1,$2,$3)
 endif
 
 else
@@ -81,10 +83,8 @@ $(call build-dependencies,$1,$2)
 
 # --- IMPLICIT RULES
 
-$(call distdir-opts,$1,$2,$3)
-
 # Just the 'v' way for programs
-$(call distdir-way-opts,$1,$2,v)
+$(call distdir-way-opts,$1,$2,v,$3)
 
 $(call c-suffix-rules,$1,$2,v,YES)
 
@@ -95,9 +95,13 @@ $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
 $(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_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)
+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) | $$$$(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) | $$$$(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 +122,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 +133,9 @@ $(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 $$< $$@
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
+$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
+       "$$(CP)" -p $$< $$@
        touch $$@
 endif
 
@@ -142,8 +145,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