Bug 791209: Update l10n mozconfigs for nightly builds. r=ted DONTBUILD
authorChris AtLee <catlee@mozilla.com>
Thu, 20 Sep 2012 12:31:03 -0400
changeset 110515 be64e9425b0b7b1c7da1051853037f85c3654b34
parent 110514 5a707ebc03294847732922f6b4d2b8a0560d56e8
child 110516 0674f4f1703ad217f20f7dd6571d6630066a7fb9
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersted
bugs791209
milestone19.0a1
Bug 791209: Update l10n mozconfigs for nightly builds. r=ted DONTBUILD
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/macosx-universal/l10n-mozconfig
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,9 +1,12 @@
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
 . $topsrcdir/build/unix/mozconfig.linux
 
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,9 +1,12 @@
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
 . $topsrcdir/build/unix/mozconfig.linux
 
 
 . "$topsrcdir/build/mozconfig.common.override"
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -0,0 +1,13 @@
+. "$topsrcdir/browser/config/mozconfigs/common"
+
+ac_add_options --with-l10n-base=../../l10n-central
+
+if [ "${MOZ_UPDATE_CHANNEL}" = "release" -o "${MOZ_UPDATE_CHANNEL}" = "beta" ]; then
+ac_add_options --enable-official-branding
+fi
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-ccache
+
+. "$topsrcdir/build/mozconfig.common.override"