зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1419182 - Remove MOZ_MAKE_FLAGS references from mozconfigs whitelists; r=mshal
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 --HG-- extra : rebase_source : 08a9e7801ae619ba1cd36f6c262c29a4735035d0 extra : intermediate-source : 8430d8501abcd30d15e0ef73d9bfa64d6ede8697 extra : source : 3f151657ee8d7a5a87629826f654ee5c807b5346
This commit is contained in:
Родитель
2ee15dbd8d
Коммит
dd886daa9b
|
@ -15,11 +15,6 @@ for platform in all_platforms:
|
|||
'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"',
|
||||
|
@ -45,7 +40,6 @@ whitelist['nightly']['macosx64'] += [
|
|||
'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',
|
||||
|
@ -55,7 +49,6 @@ whitelist['nightly']['macosx64'] += [
|
|||
|
||||
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',
|
||||
|
@ -68,7 +61,6 @@ 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}',
|
||||
|
|
Загрузка…
Ссылка в новой задаче