Bug 1386739 - Only pass --output-sync=line to make in automation. draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 15 Aug 2017 12:30:28 -0700
changeset 646866 1cffb36e5f39534ce94bae565f20a28033ec85a3
parent 643173 4c5fbf49376351679dcc49f4cff26c3c2e055ccc
child 726344 9544c431dd03eed574b1d694061cbb3acdb46aae
push id74229
push userbmo:cmanchester@mozilla.com
push dateTue, 15 Aug 2017 19:30:47 +0000
bugs1386739
milestone57.0a1
Bug 1386739 - Only pass --output-sync=line to make in automation. 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.)