Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1621529 - Use MOZ_FETCHES_DIR for pgo file paths. r=froydnj

Browse Source 
This is both for future proofing (fetches could move any time although
they likely won't), and to fix the path on the future Windows PGO
cross builds, where the fetches path is not under $WORKSPACE.

Differential Revision: https://phabricator.services.mozilla.com/D66358

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2020-03-11 10:36:11 +00:00
parent 79a1af5af5
commit 72fd664abd
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/macosx/mozconfig.common
View File

@ -9,8 +9,8 @@ if [ -z "$USE_ARTIFACT" ]; then
export LLVM_PROFDATA="$MOZ_FETCHES_DIR/clang/bin/llvm-profdata"
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog=/builds/worker/fetches/en-US.log
ac_add_options --with-pgo-profile-path=/builds/worker/fetches/merged.profdata
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

4
build/mozconfig.win-common
View File

@ -10,7 +10,7 @@ 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="${WORKSPACE}/fetches/en-US.log"
ac_add_options --with-pgo-profile-path="${WORKSPACE}/fetches/merged.profdata"
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

4
build/unix/mozconfig.unix
View File

@ -33,8 +33,8 @@ else
if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
export MOZ_LTO=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-jarlog=/builds/worker/fetches/en-US.log
ac_add_options --with-pgo-profile-path=/builds/worker/fetches/merged.profdata
ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
export LLVM_PROFDATA="$MOZ_FETCHES_DIR/clang/bin/llvm-profdata"
export AR="$MOZ_FETCHES_DIR/clang/bin/llvm-ar"
export NM="$MOZ_FETCHES_DIR/clang/bin/llvm-nm"

4
mobile/android/config/mozconfigs/common
View File

@ -51,8 +51,8 @@ if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
# This is disabled because jarlog re-ordering breaks apk publishing tasks,
# see bug 1539933.
# ac_add_options --with-pgo-jarlog=/builds/worker/fetches/en-US.log
ac_add_options --with-pgo-profile-path=/builds/worker/fetches/merged.profdata
# 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.