Bug 1380814 - buildbot linux l10n repacks generate linux64 binaries r=glandium
MozReview-Commit-ID: 1Z8JnBXeejU
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,16 +1,21 @@
no_sccache=1
ac_add_options --with-l10n-base=../../l10n
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-branding=browser/branding/nightly
. "$topsrcdir/build/mozconfig.no-compile"
+if test `uname -m` = "x86_64"; then
+ ac_add_options --target=i686-pc-linux
+ ac_add_options --host=i686-pc-linux
+fi
+
export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -1,16 +1,21 @@
no_sccache=1
ac_add_options --with-l10n-base=../../l10n
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-branding=browser/branding/aurora
. "$topsrcdir/build/mozconfig.no-compile"
+if test `uname -m` = "x86_64"; then
+ ac_add_options --target=i686-pc-linux
+ ac_add_options --host=i686-pc-linux
+fi
+
export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds