From 302967b0a822136f55649d389e0345870cae57a9 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 18 Oct 2019 20:43:19 +0200
Subject: Updated to 70.0 Build 2

---
 pgo.patch | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'pgo.patch')

diff --git a/pgo.patch b/pgo.patch
index 20eb98d..1eef0d9 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,9 +1,10 @@
-diff -up firefox-64.0/build/unix/mozconfig.unix.pgo firefox-64.0/build/unix/mozconfig.unix
---- firefox-64.0/build/unix/mozconfig.unix.pgo	2019-01-03 15:23:16.792980384 +0100
-+++ firefox-64.0/build/unix/mozconfig.unix	2019-01-03 15:24:29.978693550 +0100
+diff -up firefox-70.0/build/mozconfig.pgo firefox-70.0/build/mozconfig
+diff -up firefox-70.0/build/unix/mozconfig.unix.pgo firefox-70.0/build/unix/mozconfig.unix
+--- firefox-70.0/build/unix/mozconfig.unix.pgo	2019-10-18 18:05:36.461701704 +0200
++++ firefox-70.0/build/unix/mozconfig.unix	2019-10-18 20:25:48.036037912 +0200
 @@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then
-     CC="$TOOLTOOL_DIR/gcc/bin/gcc"
-     CXX="$TOOLTOOL_DIR/gcc/bin/g++"
+     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
+     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
  
 +    if [ -n "$MOZ_PGO" ]; then
 +        if [ -z "$USE_ARTIFACT" ]; then
@@ -16,11 +17,11 @@ diff -up firefox-64.0/build/unix/mozconfig.unix.pgo firefox-64.0/build/unix/mozc
 +
      # 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"
-diff -up firefox-64.0/extensions/spellcheck/src/moz.build.pgo firefox-64.0/extensions/spellcheck/src/moz.build
---- firefox-64.0/extensions/spellcheck/src/moz.build.pgo	2018-12-07 03:56:27.000000000 +0100
-+++ firefox-64.0/extensions/spellcheck/src/moz.build	2019-01-03 15:21:32.793385074 +0100
-@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
+     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
+diff -up firefox-70.0/extensions/spellcheck/src/moz.build.pgo firefox-70.0/extensions/spellcheck/src/moz.build
+--- firefox-70.0/extensions/spellcheck/src/moz.build.pgo	2019-10-16 23:20:18.000000000 +0200
++++ firefox-70.0/extensions/spellcheck/src/moz.build	2019-10-18 18:05:36.461701704 +0200
+@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
  
  if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
      CXXFLAGS += ['-Wno-error=shadow']
-- 
cgit