Bug 1412932 - Don't go through client.mk for maybe_clobber_profiledbuild; r?build draft
authorGregory Szorc <gps@mozilla.com>
Mon, 30 Oct 2017 14:59:22 -0700
changeset 694566 d80c49d4f9239936b72dd1ac0da98f8ad5e2648c
parent 694565 40df5dd35fdb7ce3652fe4448ac8961c075c928e
child 694567 579a7937db141db702c953c96fcd90566b55aaa8
push id88158
push userbmo:gps@mozilla.com
push dateTue, 07 Nov 2017 22:31:44 +0000
reviewersbuild
bugs1412932
milestone58.0a1
Bug 1412932 - Don't go through client.mk for maybe_clobber_profiledbuild; r?build This target is simply proxied. We don't need to go through client.mk to evaluate it. MozReview-Commit-ID: 3LF7e8LN8p0
client.mk
--- a/client.mk
+++ b/client.mk
@@ -127,17 +127,17 @@ endif
 
 MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
 
 # 'configure' scripts generated by autoconf.
 CONFIGURES := $(TOPSRCDIR)/configure
 CONFIGURES += $(TOPSRCDIR)/js/src/configure
 
 # Make targets that are going to be passed to the real build system
-OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check automation/build
+OBJDIR_TARGETS = install export libs clean realclean distclean upload sdk installer package package-compare stage-package source-package l10n-check automation/build
 
 #######################################################################
 # Rules
 
 # The default rule is build
 build::
 	$(MAKE) -f $(TOPSRCDIR)/client.mk $(if $(MOZ_PGO),profiledbuild,realbuild) CREATE_MOZCONFIG_JSON=
 
@@ -185,17 +185,17 @@ profiledbuild::
 	$(call BUILDSTATUS,TIER_START pgo_package)
 	$(MAKE) -C $(OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
 	rm -f $(OBJDIR)/jarlog/en-US.log
 	$(call BUILDSTATUS,TIER_FINISH pgo_package)
 	$(call BUILDSTATUS,TIER_START pgo_profile)
 	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(OBJDIR) pgo-profile-run
 	$(call BUILDSTATUS,TIER_FINISH pgo_profile)
 	$(call BUILDSTATUS,TIER_START pgo_clobber)
-	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild CREATE_MOZCONFIG_JSON=
+	$(MAKE) -C $(OBJDIR) maybe_clobber_profiledbuild
 	$(call BUILDSTATUS,TIER_FINISH pgo_clobber)
 	$(call BUILDSTATUS,TIER_START pgo_profile_use)
 	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1 CREATE_MOZCONFIG_JSON=
 	$(call BUILDSTATUS,TIER_FINISH pgo_profile_use)
 
 #####################################################
 # Preflight, before building any project