Bug 1770251 - Centralize PGO mozconfig bits. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D146852
This commit is contained in:
Mike Hommey 2022-05-20 08:31:46 +00:00
parent 51a4bc4fb8
commit b798bb1980
5 changed files with 7 additions and 37 deletions

View File

@ -1,13 +1,3 @@
if test `uname -s` = Linux; then
. $topsrcdir/build/macosx/cross-mozconfig.common
fi
if [ -z "$USE_ARTIFACT" ]; then
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
fi
fi

View File

@ -23,3 +23,10 @@ ac_add_options --enable-js-shell
. "$topsrcdir/build/mozconfig.automation"
. "$topsrcdir/build/mozconfig.rust"
. "$topsrcdir/build/mozconfig.cache"
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" -a -z "$USE_ARTIFACT" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog="${MOZ_FETCHES_DIR}/en-US.log"
ac_add_options --with-pgo-profile-path="${MOZ_FETCHES_DIR}/merged.profdata"
fi

View File

@ -1,12 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if [ -z "$USE_ARTIFACT" ]; then
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog="${MOZ_FETCHES_DIR}/en-US.log"
ac_add_options --with-pgo-profile-path="${MOZ_FETCHES_DIR}/merged.profdata"
fi
fi

View File

@ -23,15 +23,6 @@ else
;;
esac
if [ -z "$USE_ARTIFACT" ]; then
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
fi
fi
mk_add_options "export PATH=$MOZ_FETCHES_DIR/binutils/bin:$PATH"
fi

View File

@ -26,15 +26,6 @@ ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" -a -z "$USE_ARTIFACT" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
fi
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1