Merge latest green inbound changeset and mozilla-central
authorEd Morley <emorley@mozilla.com>
Wed, 15 Jan 2014 15:54:08 +0000
changeset 163466 dd2cf81c56b75beb1a11f3d1c7c7084be9c29303
parent 163465 490e91b5f68c3ef68fbd8ac6c072b9b7be181437 (current diff)
parent 163403 bda00523b05752bc722874528133c3938641052a (diff)
child 163504 fed681aea42d4ca0ae53a2ada94c2aa70d2b90b0
push id25996
push useremorley@mozilla.com
push dateWed, 15 Jan 2014 15:54:39 +0000
treeherdermozilla-central@dd2cf81c56b7 [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 latest green inbound changeset and mozilla-central
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -1,14 +1,12 @@
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 
-ac_add_options --disable-unified-compilation
-
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/linux64/debug-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
+
+ac_add_options --disable-unified-compilation
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/linux64/nightly-nonunified
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
+
+ac_add_options --disable-unified-compilation