Bug 1419128 - Remove MOZ_MAKE_FLAGS references from mozconfigs whitelists; r?build draft
authorGregory Szorc <gps@mozilla.com>
Tue, 31 Oct 2017 14:29:21 -0700
changeset 700812 0a034506feb9c670e57fa8cc92234f19038f53aa
parent 700811 c5e3f1cdd82f14d74c99357c19aa6a7b6d94eabc
child 700813 cbf887639e657f5003f55f8a9bca623b2ddb4bd0
push id89984
push userbmo:gps@mozilla.com
push dateMon, 20 Nov 2017 23:14:50 +0000
reviewersbuild
bugs1419128
milestone59.0a1
Bug 1419128 - Remove MOZ_MAKE_FLAGS references from mozconfigs whitelists; r?build We no longer define MOZ_MAKE_FLAGS in the in-repo mozconfigs. Nor do we pass MOZ_MAKE_FLAGS from any automation configs as far as I can tell. MozReview-Commit-ID: LYU1dI44uhX
browser/config/mozconfigs/whitelist
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -10,21 +10,16 @@ all_platforms = ['win64', 'win32', 'linu
 for platform in all_platforms:
     whitelist['nightly'][platform] = [
         'ac_add_options --enable-update-channel=nightly',
         'ac_add_options --with-branding=browser/branding/nightly',
         'ac_add_options --enable-profiling',
         'mk_add_options CLIENT_PY_ARGS="--hg-options=\'--verbose --time\' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print"'
     ]
 
-for platform in ['linux32', 'linux64', 'macosx64']:
-    whitelist['nightly'][platform] += [
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
-    ]
-
 whitelist['nightly']['linux32'] += [
     'CXX=$REAL_CXX',
     'CXX="ccache $REAL_CXX"',
     'CC="ccache $REAL_CC"',
     'mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl',
     'ac_add_options --with-ccache=/usr/bin/ccache',
     'export MOZILLA_OFFICIAL=1',
     'export MOZ_TELEMETRY_REPORTING=1',
@@ -40,40 +35,37 @@ whitelist['nightly']['linux64'] += [
     'ac_add_options --with-ccache=/usr/bin/ccache',
 ]
 
 whitelist['nightly']['macosx64'] += [
     'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
     'if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then',
     'ac_add_options --with-macbundlename-prefix=Firefox',
     'fi',
-    'mk_add_options MOZ_MAKE_FLAGS="-j12"',
     'ac_add_options --with-ccache',
     'ac_add_options --disable-install-strip',
     'ac_add_options --enable-instruments',
     'ac_add_options --enable-dtrace',
     'if test `uname -s` != Linux; then',
 ]
 
 whitelist['nightly']['win32'] += [
     '. $topsrcdir/configs/mozilla2/win32/include/choose-make-flags',
-    'mk_add_options MOZ_MAKE_FLAGS=-j1',
     'if test "$IS_NIGHTLY" != ""; then',
     'ac_add_options --disable-auto-deps',
     'fi',
 ]
 whitelist['nightly']['win64'] += [
     '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',
 ]
 
 for platform in all_platforms:
     whitelist['release'][platform] = [
         'ac_add_options --enable-update-channel=release',
         'ac_add_options --enable-official-branding',
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
         'export BUILDING_RELEASE=1',
         'if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then',
         'MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}',
         'MOZ_AUTOMATION_UPDATE_PACKAGING=1',
         'fi',
     ]
 whitelist['release']['win32'] += ['ac_add_options MOZ_PGO=1']
 whitelist['release']['win64'] += ['ac_add_options MOZ_PGO=1']