Bug 1310993 - Port client.mk change from bug 1296530. rs=bustage-fix
authoraleth <aleth@instantbird.org>
Tue, 18 Oct 2016 14:30:03 +0200
changeset 20380 a8b5d1bc96d85379b79007bf4e9096b54afc11d5
parent 20379 c0c1139bba2e68c27a7b0c85cd380d4e71067349
child 20381 c37a70ed7e13e219d51c5cef1e6d2ff35fd83142
push id1834
push userclokep@gmail.com
push dateMon, 23 Jan 2017 21:48:40 +0000
treeherdercomm-esr52@293cffe83e59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1310993, 1296530
Bug 1310993 - Port client.mk change from bug 1296530. rs=bustage-fix
client.mk
--- a/client.mk
+++ b/client.mk
@@ -107,17 +107,19 @@ export FOUND_MOZCONFIG
 # lines themselves. It can thus safely be used to replaces normal spaces,
 # to then replace newlines with normal spaces. This allows to get a list
 # of mozconfig output lines.
 MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CONTENT)))
 # Filter-out comments from those lines.
 START_COMMENT = \#
 MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))
 
+ifdef MOZ_PGO
 export MOZ_PGO
+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