From a607ccb1d608e2c800f12893915da05f942c22bc Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 3 Dec 2013 16:53:39 +0900 Subject: [PATCH] Bug 945496 - Disable unified builds on tbpl debug builds. r=ehsan Until we can do something better --- browser/config/mozconfigs/linux32/debug | 2 ++ browser/config/mozconfigs/linux64/debug | 2 ++ browser/config/mozconfigs/linux64/debug-static-analysis-clang | 2 ++ browser/config/mozconfigs/macosx64/debug | 2 ++ browser/config/mozconfigs/macosx64/debug-asan | 2 ++ browser/config/mozconfigs/win32/debug | 2 ++ browser/config/mozconfigs/win64/debug | 2 ++ 7 files changed, 14 insertions(+) diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug index ab56a2beebf..cce7f9e8048 100644 --- a/browser/config/mozconfigs/linux32/debug +++ b/browser/config/mozconfigs/linux32/debug @@ -2,6 +2,8 @@ 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.linux32 # Needed to enable breakpad in application.ini diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug index 3c8d8022080..631cc91c6cc 100644 --- a/browser/config/mozconfigs/linux64/debug +++ b/browser/config/mozconfigs/linux64/debug @@ -2,6 +2,8 @@ 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 diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang index 10931a4421e..a7a64d2fa4a 100644 --- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang +++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang @@ -2,6 +2,8 @@ ac_add_options --enable-debug +ac_add_options --disable-unified-compilation + # Use Clang as specified in manifest export CC="$topsrcdir/clang/bin/clang" export CXX="$topsrcdir/clang/bin/clang++" diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug index ebf8099456b..b258c67b4ed 100644 --- a/browser/config/mozconfigs/macosx64/debug +++ b/browser/config/mozconfigs/macosx64/debug @@ -5,6 +5,8 @@ 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 diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/browser/config/mozconfigs/macosx64/debug-asan index 97ced38c45f..31e2f28df28 100644 --- a/browser/config/mozconfigs/macosx64/debug-asan +++ b/browser/config/mozconfigs/macosx64/debug-asan @@ -5,6 +5,8 @@ ac_add_options --enable-debug ac_add_options --enable-optimize="-O1" ac_add_options --enable-accessibility +ac_add_options --disable-unified-compilation + # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug index 8427117e9cb..93254fb7bed 100644 --- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -5,6 +5,8 @@ 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 diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug index aff6627fe6e..6aed46ed098 100644 --- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -8,6 +8,8 @@ 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