mozilla-beta: changeset 180871:563a34caea39f046e68d39cf3d5d54b2891c346d

author	Ryan VanderMeulen <ryanvm@gmail.com>
	Thu, 23 Jan 2014 10:14:23 -0500
changeset 180871	563a34caea39f046e68d39cf3d5d54b2891c346d
parent 180870	36744b165ec61d537f3b713d195cebaf9e5e2cf3 (current diff)
parent 180837	8dc7bf30840d27d974c82ab06d1583209a30687f (diff)
child 180872	a9a4736ea178faa2072792ff63cf26bea214f8d2
push id	3343
push user	ffxbld
push date	Mon, 17 Mar 2014 21:55:32 +0000
treeherder	mozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
milestone	29.0a1
first release with	nightly linux32 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly linux64 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly mac 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly win32 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly win64 9d650c07b547 / 29.0a1 / 20140124030216 / files
last release without	nightly linux32 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly linux64 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly mac b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly win32 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly win64 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/macosx-universal/nightly-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
+
+ac_add_options --disable-unified-compilation

--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -1,17 +1,15 @@
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-accessibility
 ac_add_options --enable-signmar
 
-ac_add_options --disable-unified-compilation
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/macosx64/debug-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
+
+ac_add_options --disable-unified-compilation

--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -1,17 +1,15 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-metro
 
-ac_add_options --disable-unified-compilation
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
   . $topsrcdir/build/win32/mozconfig.vs2010-win64
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win32/debug-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/win32/debug"
+
+ac_add_options --disable-unified-compilation

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win32/nightly-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
+
+ac_add_options --disable-unified-compilation

--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -3,18 +3,16 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-metro
 
-ac_add_options --disable-unified-compilation
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 . $topsrcdir/build/win64/mozconfig.vs2010

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64/debug-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/win64/debug"
+
+ac_add_options --disable-unified-compilation

new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64/nightly-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
+
+ac_add_options --disable-unified-compilation