diff --git a/Makefile.in b/Makefile.in index 849a4bfaced0..96f8c78a8f67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -172,8 +172,14 @@ faster: install-dist/idl endif .PHONY: tup -tup: install-manifests buildid.h source-repo.h +tup: + $(call BUILDSTATUS,TIERS make tup) + $(call BUILDSTATUS,TIER_START make) + $(MAKE) install-manifests buildid.h source-repo.h + $(call BUILDSTATUS,TIER_FINISH make) + $(call BUILDSTATUS,TIER_START tup) @$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose) + $(call BUILDSTATUS,TIER_FINISH tup) # process_install_manifest needs to be invoked with --no-remove when building # js as standalone because automated builds are building nspr separately and diff --git a/python/mozbuild/mozbuild/backend/tup.py b/python/mozbuild/mozbuild/backend/tup.py index 211aa7efb402..0f7250eb0155 100644 --- a/python/mozbuild/mozbuild/backend/tup.py +++ b/python/mozbuild/mozbuild/backend/tup.py @@ -340,6 +340,5 @@ class TupBackend(HybridBackend(TupOnly, RecursiveMakeBackend)): def build(self, config, output, jobs, verbose): status = config._run_make(directory=self.environment.topobjdir, target='tup', line_handler=output.on_line, log=False, print_directory=False, - ensure_exit_code=False, num_jobs=jobs, silent=not verbose, - append_env={b'NO_BUILDSTATUS_MESSAGES': b'1'}) + ensure_exit_code=False, num_jobs=jobs, silent=not verbose) return status