From 9fffb187e99cb0a4bae14fcc82960a71f9131a5a Mon Sep 17 00:00:00 2001
From: "sayrer%gmail.com" <sayrer%gmail.com>
Date: Fri, 22 Feb 2008 04:47:05 +0000
Subject: [PATCH] back out PGO for linux

---
 tools/tinderbox-configs/firefox/linux/CLOBBER          | 2 +-
 tools/tinderbox-configs/firefox/linux/mozconfig        | 2 +-
 tools/tinderbox-configs/firefox/linux/tinder-config.pl | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/tinderbox-configs/firefox/linux/CLOBBER b/tools/tinderbox-configs/firefox/linux/CLOBBER
index 0c0b572e160..7b44a28bda5 100644
--- a/tools/tinderbox-configs/firefox/linux/CLOBBER
+++ b/tools/tinderbox-configs/firefox/linux/CLOBBER
@@ -1 +1 @@
-clobbering to try and get PGO right
\ No newline at end of file
+clobbering to back out PGO
\ No newline at end of file
diff --git a/tools/tinderbox-configs/firefox/linux/mozconfig b/tools/tinderbox-configs/firefox/linux/mozconfig
index 70713e5b185..84a204e5563 100644
--- a/tools/tinderbox-configs/firefox/linux/mozconfig
+++ b/tools/tinderbox-configs/firefox/linux/mozconfig
@@ -7,7 +7,7 @@ export CFLAGS="-gstabs+"
 export CXXFLAGS="-gstabs+"
 
 mk_add_options MOZ_CO_PROJECT=browser
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs"
 ac_add_options --enable-application=browser
 
diff --git a/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/tools/tinderbox-configs/firefox/linux/tinder-config.pl
index 6a644d7c525..765b336d92d 100644
--- a/tools/tinderbox-configs/firefox/linux/tinder-config.pl
+++ b/tools/tinderbox-configs/firefox/linux/tinder-config.pl
@@ -44,7 +44,7 @@ $DisplayServer = ':0.0';
 
 #- Default values of command-line opts
 #-
-$BuildDepend       = 0;      # Depend or Clobber
+#$BuildDepend       = 1;      # Depend or Clobber
 #$BuildDebug        = 0;      # Debug or Opt (Darwin)
 #$ReportStatus      = 1;      # Send results to server, or not
 #$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
@@ -196,7 +196,6 @@ $BinaryName = 'firefox-bin';
 #$NSPRArgs = '';
 #$ShellOverride = '';
 
-$ProfiledBuild = 1;
 # Release build options
 $ReleaseBuild  = 1;
 $shiptalkback  = 0;