Skip to content

Commit

Permalink
Bug 1654371 - Get verbose output from mach artifact install in arti…
Browse files Browse the repository at this point in the history
…fact builds if we're doing verbose build logging r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D84419
  • Loading branch information
Ricky Stewart committed Jul 21, 2020
1 parent 81a0386 commit 3c2459f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,21 @@ recurse_pre-export:: install-manifests
binaries::
@$(MAKE) install-manifests install_manifests=dist/include

ifdef BUILD_VERBOSE_LOG
verbose_flag = -v
endif

# Host binaries are not produced for macOS consumers: that is, there's
# no macOS-hosted job to produce them at this time. Therefore we
# enable --host-bins only for automation builds, which only require Linux and
# Windows host binaries.
recurse_artifact:
$(topsrcdir)/mach --log-no-times artifact install$(if $(MOZ_ARTIFACT_BUILD_SYMBOLS), --symbols$(addprefix =,$(filter full,$(MOZ_ARTIFACT_BUILD_SYMBOLS))))$(if $(MOZ_AUTOMATION), --host-bins)
$(topsrcdir)/mach --log-no-times artifact install$(if $(MOZ_ARTIFACT_BUILD_SYMBOLS), --symbols$(addprefix =,$(filter full,$(MOZ_ARTIFACT_BUILD_SYMBOLS))))$(if $(MOZ_AUTOMATION), --host-bins) $(verbose_flag)

ifdef MOZ_EME_WIN32_ARTIFACT
recurse_win32-artifact:
rm -rf $(DIST)/i686
$(topsrcdir)/mach --log-no-times artifact install --job $(if $(MOZ_PGO),win32-pgo,win32-opt) --no-tests --distdir $(DIST)/i686
$(topsrcdir)/mach --log-no-times artifact install --job $(if $(MOZ_PGO),win32-pgo,win32-opt) --no-tests --distdir $(DIST)/i686 $(verbose_flag)
mv $(DIST)/i686/bin/* $(DIST)/i686
endif

Expand Down

0 comments on commit 3c2459f

Please sign in to comment.