Bug 1536194 - Fix uses of MOZ_LTO in a few mozconfigs; r=firefox-build-system-reviewers,glandium
authorMike Shal <mshal@mozilla.com>
Tue, 09 Apr 2019 06:37:06 +0000
changeset 468601 89c293eaf78e37edc34917370ee62a6c2a83d172
parent 468600 17b96c33164ec887ae256a7e5501dd365af8911d
child 468602 53e379a5738feb54107333ef592198263ea1cf44
push id35843
push usernbeleuzu@mozilla.com
push dateTue, 09 Apr 2019 22:08:13 +0000
treeherdermozilla-central@a31032a16330 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, glandium
bugs1536194, 1530908
milestone68.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 1536194 - Fix uses of MOZ_LTO in a few mozconfigs; r=firefox-build-system-reviewers,glandium After bug 1530908 changed LTO to be environment driven, the macosx64 nightly mozconfig enables LTO by setting MOZ_LTO=1. The add-on-devel mozconfig tried to disable LTO by using --disable-lto, but the environment variable takes precedence, leaving LTO enabled for these builds. This pushed the build time up to be close to the max runtime for the task, causing frequent intermittent failures. We should 'unset MOZ_LTO' everywhere that --disable-lto was used, and 'export MOZ_LTO=1' everywhere --enable-lto was used. Differential Revision: https://phabricator.services.mozilla.com/D26608
browser/config/mozconfigs/linux64/profile-use
browser/config/mozconfigs/macosx64/add-on-devel
browser/config/mozconfigs/macosx64/code-coverage
browser/config/mozconfigs/macosx64/nightly-fuzzing-asan
--- a/browser/config/mozconfigs/linux64/profile-use
+++ b/browser/config/mozconfigs/linux64/profile-use
@@ -1,6 +1,6 @@
 . $topsrcdir/browser/config/mozconfigs/linux64/nightly
 
+export MOZ_LTO=1
 ac_add_options --enable-profile-use
-ac_add_options --enable-lto
 ac_add_options --with-pgo-jarlog=/builds/worker/fetches/en-US.log
 ac_add_options --with-pgo-profile-path=/builds/worker/fetches/default.profraw
--- a/browser/config/mozconfigs/macosx64/add-on-devel
+++ b/browser/config/mozconfigs/macosx64/add-on-devel
@@ -1,11 +1,11 @@
 . $topsrcdir/browser/config/mozconfigs/macosx64/nightly
 
-ac_add_options --disable-lto
+unset MOZ_LTO
 
 #add-on signing is checked but not enforced
 MOZ_REQUIRE_SIGNING=0
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --enable-update-channel=default
--- a/browser/config/mozconfigs/macosx64/code-coverage
+++ b/browser/config/mozconfigs/macosx64/code-coverage
@@ -1,11 +1,11 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
 
-ac_add_options --disable-lto
+unset MOZ_LTO
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 ac_add_options --disable-sandbox
 ac_add_options --disable-warnings-as-errors
 ac_add_options --enable-coverage
 
 export LDFLAGS="-coverage -L$topsrcdir/clang/lib/clang/8.0.0/lib/darwin/"
--- a/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan
+++ b/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan
@@ -1,3 +1,3 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly-asan"
-ac_add_options --disable-lto
+unset MOZ_LTO
 ac_add_options --enable-fuzzing