Bug 1386739 - Only pass --output-sync=line to make in automation. r=gps
authorChris Manchester <cmanchester@mozilla.com>
Tue, 15 Aug 2017 12:30:28 -0700
changeset 424405 01e66f5fde9f51533c27b158086659e4b2a1fea2
parent 424404 b76e179f89c83d78c1cb34607b2a36d7f9070134
child 424406 e799dec81a4739bc3a1ffd6d5a93f25d140b53c5
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1386739
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1386739 - Only pass --output-sync=line to make in automation. r=gps MozReview-Commit-ID: BN8nJv1wAr0
client.mk
--- a/client.mk
+++ b/client.mk
@@ -137,19 +137,21 @@ ifdef MOZ_PARALLEL_BUILD
 endif
 
 # Automatically add -jN to make flags if not defined. N defaults to number of cores.
 ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS)))
   cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())')
   MOZ_MAKE_FLAGS += -j$(cores)
 endif
 
+ifdef MOZ_AUTOMATION
 ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
 MOZ_MAKE_FLAGS += --output-sync=line
 endif
+endif
 
 ifdef MOZ_BUILD_PROJECTS
 
 ifdef MOZ_CURRENT_PROJECT
   BUILD_PROJECT_ARG = MOZ_BUILD_APP=$(MOZ_CURRENT_PROJECT)
   export MOZ_CURRENT_PROJECT
 else
   MOZ_MAKE = $(error Cannot build in the OBJDIR when MOZ_CURRENT_PROJECT is not set.)