Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 864262 - Allow to do 32-bits linux builds in x86-64 mock environments. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2013-04-24 19:34:48 +02:00
parent 4e483b7739
commit beabd37d57
7 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/config/mozconfigs/linux32/debug
View File

@ -3,7 +3,7 @@ ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
ENABLE_MARIONETTE=1
. $topsrcdir/build/unix/mozconfig.linux
. $topsrcdir/build/unix/mozconfig.linux32
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat

2
browser/config/mozconfigs/linux32/l10n-mozconfig
View File

@ -5,7 +5,7 @@ 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/unix/mozconfig.linux32
export MOZILLA_OFFICIAL=1

2
browser/config/mozconfigs/linux32/nightly
View File

@ -7,7 +7,7 @@ ac_add_options --enable-profiling
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
. $topsrcdir/build/unix/mozconfig.linux
. $topsrcdir/build/unix/mozconfig.linux32
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat

2
browser/config/mozconfigs/linux32/qt
View File

@ -1,7 +1,7 @@
ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs
. $topsrcdir/build/unix/mozconfig.linux
. $topsrcdir/build/unix/mozconfig.linux32
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat

2
browser/config/mozconfigs/linux32/release
View File

@ -2,7 +2,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-official-branding
. $topsrcdir/build/unix/mozconfig.linux
. $topsrcdir/build/unix/mozconfig.linux32
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat

2
browser/config/mozconfigs/linux32/rpm
View File

@ -9,7 +9,7 @@ ac_add_options --disable-updater
ac_add_options --prefix=$PREFIX
ac_add_options --libdir=$LIBDIR
. $topsrcdir/build/unix/mozconfig.linux
. $topsrcdir/build/unix/mozconfig.linux32
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat

9
build/unix/mozconfig.linux32 Normal file
View File

@ -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