diff options
Diffstat (limited to 'http/firefox/patches/7001_make-pgo-use-toolchain.patch')
| -rw-r--r-- | http/firefox/patches/7001_make-pgo-use-toolchain.patch | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/http/firefox/patches/7001_make-pgo-use-toolchain.patch b/http/firefox/patches/7001_make-pgo-use-toolchain.patch index e7afcf4824..bccc22642e 100644 --- a/http/firefox/patches/7001_make-pgo-use-toolchain.patch +++ b/http/firefox/patches/7001_make-pgo-use-toolchain.patch @@ -1,8 +1,17 @@ +# HG changeset patch +# Parent 19684dd9010f6e104af6997b67baef6c4c633337 + +diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix --- a/build/unix/mozconfig.unix +++ b/build/unix/mozconfig.unix -@@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then - CC="$TOOLTOOL_DIR/gcc/bin/gcc" - CXX="$TOOLTOOL_DIR/gcc/bin/g++" +@@ -1,16 +1,25 @@ + . "$topsrcdir/build/mozconfig.common" + + TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} + + if [ -n "$FORCE_GCC" ]; then + CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" + CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" + if [ -n "$MOZ_PGO" ]; then + if [ -z "$USE_ARTIFACT" ]; then @@ -15,4 +24,9 @@ + # We want to make sure we use binutils and other binaries in the tooltool # package. - mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH" + mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" + ac_add_options --with-clang-path=$MOZ_FETCHES_DIR/clang/bin/clang + else + CC="$MOZ_FETCHES_DIR/clang/bin/clang" + CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" + export ENABLE_CLANG_PLUGIN=1 |