Bug 946576 - Disable unified builds on b2g and xulrunner builds, and android debug builds. r=ehsan
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 06 Dec 2013 08:45:29 +0900
changeset 174710 258bb2ea7c1a98bf5542a74761582c76cfbe3955
parent 174709 5b2094cfc80ff16cf9dccd18f395fc24eefaf9d7
child 174711 a7cf94f8971925b2bf50cfd194353abf4afca052
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs946576
milestone28.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
Bug 946576 - Disable unified builds on b2g and xulrunner builds, and android debug builds. r=ehsan
b2g/config/mozconfigs/common
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android/debug
xulrunner/config/mozconfigs/common
--- a/b2g/config/mozconfigs/common
+++ b/b2g/config/mozconfigs/common
@@ -1,7 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all b2g mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --disable-unified-compilation
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -1,12 +1,13 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -1,12 +1,13 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=i386-linux-android
 
 if test `uname -m` = 'x86_64'; then
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -1,12 +1,13 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 
 if test `uname -m` = 'x86_64'; then
--- a/xulrunner/config/mozconfigs/common
+++ b/xulrunner/config/mozconfigs/common
@@ -1,7 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all xulrunner mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --disable-unified-compilation