Bug 946576 - Disable unified builds on b2g and xulrunner builds, and …

…android debug builds. r=ehsan
calixteman · Dec 5, 2013 · bc8136b · bc8136b
1 parent 47bcdc4
commit bc8136b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/b2g/config/mozconfigs/common b/b2g/config/mozconfigs/common
@@ -5,3 +5,5 @@
 # This file is included at the top of all b2g mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --disable-unified-compilation
diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -2,6 +2,7 @@
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android

diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug
@@ -2,6 +2,7 @@
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android

diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug
@@ -2,6 +2,7 @@
 
 # Global options
 ac_add_options --enable-debug
+ac_add_options --disable-unified-compilation
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android

diff --git a/xulrunner/config/mozconfigs/common b/xulrunner/config/mozconfigs/common
@@ -5,3 +5,5 @@
 # This file is included at the top of all xulrunner mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
+
+ac_add_options --disable-unified-compilation
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@
		# This file is included at the top of all b2g mozconfigs

		. "$topsrcdir/build/mozconfig.common"

		ac_add_options --disable-unified-compilation