Port bug 864262 - Allow to do 32-bits build in x86-64 mock environments r=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 18 May 2013 08:51:44 +0100
changeset 15627 3f84d71adf7584a75854acccb45a29c2434178c8
parent 15626 935587b49b749d3aabecb2b4d85d3621e87d525c
child 15628 189e8f06c19a6863fd6691d86064cf9ef0dcf4c6
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix
bugs864262
Port bug 864262 - Allow to do 32-bits build in x86-64 mock environments r=bustage-fix
build/unix/mozconfig.linux32
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/l10n-mozconfig
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
new file mode 100644
--- /dev/null
+++ b/build/unix/mozconfig.linux32
@@ -0,0 +1,9 @@
+. "$topsrcdir/build/unix/mozconfig.linux"
+
+if test `uname -m` = "x86_64"; then
+  CC="$CC -m32"
+  CXX="$CXX -m32"
+  ac_add_options --target=i686-pc-linux
+  ac_add_options --x-libraries=/usr/lib
+  export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
+fi
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -1,15 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
-. $topsrcdir/build/unix/mozconfig.linux
+. $topsrcdir/build/unix/mozconfig.linux32
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -4,17 +4,17 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-profiling
 ac_add_options --with-l10n-base=../../l10n
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-. $topsrcdir/build/unix/mozconfig.linux
+. $topsrcdir/build/unix/mozconfig.linux32
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,17 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
-. $topsrcdir/build/unix/mozconfig.linux
+. $topsrcdir/build/unix/mozconfig.linux32
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -1,15 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
-. $topsrcdir/build/unix/mozconfig.linux
+. $topsrcdir/build/unix/mozconfig.linux32
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols