Bug 1044458 - Work around l10n jobs cherry-picking parts of the build system on a CLOSED TREE. r=mshal,a=ryanvm

browser/config/mozconfigs/linux32/l10n-mozconfig

@@ -9,4 +9,6 @@ ac_add_options --enable-update-packaging
 
 export MOZILLA_OFFICIAL=1
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/linux64/l10n-mozconfig

@@ -9,4 +9,6 @@ ac_add_options --enable-update-packaging
 
 export MOZILLA_OFFICIAL=1
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/build/mozconfig.common.override"

config/Makefile.in

@@ -16,6 +16,10 @@ endif
 
 include $(topsrcdir)/config/config.mk
 
+# L10n jobs are doing make -C config manually before anything else,
+# and need nsinstall to be built as a consequence.
+export:: host
+
 ifneq (WINNT,$(HOST_OS_ARCH))
 ifdef COMPILE_ENVIRONMENT
 # Ensure nsinstall is atomically created

mobile/android/config/mozconfigs/android-armv6/l10n-nightly

@@ -22,4 +22,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-armv6/l10n-release

@@ -20,4 +20,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-x86/l10n-nightly

@@ -20,4 +20,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-x86/l10n-release

@@ -18,4 +18,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android/l10n-nightly

@@ -22,4 +22,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android/l10n-release

@@ -20,4 +20,6 @@ export MOZ_DISABLE_GECKOVIEW=1
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta
 
+ac_add_options --disable-stdcxx-compat
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"