From b48b3e4db022f51bf3fbbdf07e05c2b8987ca00b Mon Sep 17 00:00:00 2001 From: Gabriele Svelto Date: Fri, 17 Aug 2018 16:40:10 +0000 Subject: [PATCH] Bug 1473821 - The MOZ_PGO_INSTRUMENTED environment variable is not used anymore so remove all remaining mentions of it r=gps Differential Revision: https://phabricator.services.mozilla.com/D3219 --HG-- extra : moz-landing-system : lando --- Makefile.in | 6 +++--- build/docs/pgo.rst | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6f5a7752306a..21dcfe18c591 100644 --- a/Makefile.in +++ b/Makefile.in @@ -211,14 +211,14 @@ default all:: profiledbuild:: $(call BUILDSTATUS,TIERS pgo_profile_generate pgo_package pgo_profile pgo_clobber pgo_profile_use) $(call BUILDSTATUS,TIER_START pgo_profile_generate) - $(MAKE) default MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1 + $(MAKE) default MOZ_PROFILE_GENERATE=1 $(call BUILDSTATUS,TIER_FINISH pgo_profile_generate) $(call BUILDSTATUS,TIER_START pgo_package) - $(MAKE) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT= + $(MAKE) package MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT= rm -f 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 $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py 10 + JARLOG_FILE=jarlog/en-US.log $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py 10 $(call BUILDSTATUS,TIER_FINISH pgo_profile) $(call BUILDSTATUS,TIER_START pgo_clobber) $(MAKE) maybe_clobber_profiledbuild diff --git a/build/docs/pgo.rst b/build/docs/pgo.rst index bcd2a84c1147..ed714f834499 100644 --- a/build/docs/pgo.rst +++ b/build/docs/pgo.rst @@ -23,8 +23,7 @@ Then:: This is roughly equivalent to:: -#. Perform a build with *MOZ_PROFILE_GENERATE=1* and *MOZ_PGO_INSTRUMENTED=1* -#. Package with *MOZ_PGO_INSTRUMENTED=1* +#. Perform a build with *MOZ_PROFILE_GENERATE=1* #. Performing a run of the instrumented binaries #. $ make maybe_clobber_profiledbuild #. Perform a build with *MOZ_PROFILE_USE=1*