Merge m-c to fx-team.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 23 Jan 2014 10:15:47 -0500
changeset 180937 0460dae9df6504244cf673dbe5f8b050d5cae7a7
parent 180936 6bbfaa5f5775391d1ea757fe600f59a550589e87 (current diff)
parent 180837 8dc7bf30840d27d974c82ab06d1583209a30687f (diff)
child 180938 72300f62e00cbd7118f8cf8408af690a8f87988e
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to fx-team.
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