bug 720027 - turn the speed of Mac builds up to 11 r=ted

Brli · Apr 10, 2012 · 5df8a98 · 5df8a98
1 parent 5e2eb14
commit 5df8a98
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 111 deletions.
diff --git a/browser/config/mozconfigs/macosx-lion-universal/nightly b/browser/config/mozconfigs/macosx-lion-universal/nightly
diff --git a/browser/config/mozconfigs/macosx-lion-universal/release b/browser/config/mozconfigs/macosx-lion-universal/release
diff --git a/browser/config/mozconfigs/macosx-lion-universal/shark b/browser/config/mozconfigs/macosx-lion-universal/shark
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
@@ -16,12 +16,13 @@ ac_add_options --enable-js-diagnostics
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx-universal/shark b/browser/config/mozconfigs/macosx-universal/shark
@@ -12,7 +12,7 @@ ac_add_options --disable-install-strip
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # shark specific options
 ac_add_options --enable-shark
@@ -23,3 +23,4 @@ export MOZ_PKG_SPECIAL="shark"
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx32-lion/debug b/browser/config/mozconfigs/macosx32-lion/debug
diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug
@@ -4,12 +4,13 @@ ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64-lion/debug b/browser/config/mozconfigs/macosx64-lion/debug
diff --git a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig b/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
@@ -6,7 +6,7 @@ ac_add_options --enable-accessibility
 ac_add_options --enable-signmar
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
@@ -15,6 +15,7 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -2,3 +2,4 @@ ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
+ac_add_options --with-ccache