Bug 577431, build dump_syms as a 32bit utility in mac64 builds (to use less memory in buildsymbols and be able to complete that), r=catlee
☠☠ backed out by f847295b6788 ☠ ☠
authorNick Thomas <nthomas@mozilla.com>
Mon, 26 Jul 2010 13:21:50 +1200
changeset 2749 9340c8d65ce719e8199f7cdc333a36008791a6f0
parent 2748 4f5093a5134971abe15eb6c57d43328f1017e743
child 2750 f847295b67884f2c9dad15f5a80b34de167271cc
push id2148
push usernthomas@mozilla.com
push dateMon, 26 Jul 2010 01:22:11 +0000
reviewerscatlee
bugs577431
Bug 577431, build dump_syms as a 32bit utility in mac64 builds (to use less memory in buildsymbols and be able to complete that), r=catlee
mozilla2-staging/macosx64/birch/debug/mozconfig
mozilla2-staging/macosx64/birch/nightly/mozconfig
mozilla2-staging/macosx64/cedar/debug/mozconfig
mozilla2-staging/macosx64/cedar/nightly/mozconfig
mozilla2-staging/macosx64/maple/debug/mozconfig
mozilla2-staging/macosx64/maple/nightly/mozconfig
mozilla2-staging/macosx64/mozilla-2.0/debug/mozconfig
mozilla2-staging/macosx64/mozilla-2.0/nightly/mozconfig
mozilla2-staging/macosx64/mozilla-2.0/release/mozconfig
mozilla2-staging/macosx64/mozilla-central/debug/mozconfig
mozilla2-staging/macosx64/mozilla-central/nightly/mozconfig
mozilla2-staging/macosx64/mozilla-central/release/mozconfig
mozilla2-staging/macosx64/tryserver/debug/mozconfig
mozilla2-staging/macosx64/tryserver/nightly/mozconfig
mozilla2/macosx64/birch/debug/mozconfig
mozilla2/macosx64/birch/nightly/mozconfig
mozilla2/macosx64/cedar/debug/mozconfig
mozilla2/macosx64/cedar/nightly/mozconfig
mozilla2/macosx64/maple/debug/mozconfig
mozilla2/macosx64/maple/nightly/mozconfig
mozilla2/macosx64/mozilla-2.0/debug/mozconfig
mozilla2/macosx64/mozilla-2.0/nightly/mozconfig
mozilla2/macosx64/mozilla-2.0/release/mozconfig
mozilla2/macosx64/mozilla-central/debug/mozconfig
mozilla2/macosx64/mozilla-central/nightly/mozconfig
mozilla2/macosx64/mozilla-central/release/mozconfig
mozilla2/macosx64/tryserver/debug/mozconfig
mozilla2/macosx64/tryserver/nightly/mozconfig
--- a/mozilla2-staging/macosx64/birch/debug/mozconfig
+++ b/mozilla2-staging/macosx64/birch/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/birch/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/birch/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/cedar/debug/mozconfig
+++ b/mozilla2-staging/macosx64/cedar/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/cedar/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/cedar/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/maple/debug/mozconfig
+++ b/mozilla2-staging/macosx64/maple/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/maple/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/maple/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/mozilla-2.0/debug/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-2.0/debug/mozconfig
@@ -7,8 +7,16 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2-staging/macosx64/mozilla-2.0/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-2.0/nightly/mozconfig
@@ -10,10 +10,18 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/mozilla2-staging/macosx64/mozilla-2.0/release/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-2.0/release/mozconfig
@@ -8,8 +8,16 @@ export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2-staging/macosx64/mozilla-central/debug/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-central/debug/mozconfig
@@ -7,8 +7,16 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2-staging/macosx64/mozilla-central/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-central/nightly/mozconfig
@@ -10,10 +10,18 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/mozilla2-staging/macosx64/mozilla-central/release/mozconfig
+++ b/mozilla2-staging/macosx64/mozilla-central/release/mozconfig
@@ -8,8 +8,16 @@ export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2-staging/macosx64/tryserver/debug/mozconfig
+++ b/mozilla2-staging/macosx64/tryserver/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2-staging/macosx64/tryserver/nightly/mozconfig
+++ b/mozilla2-staging/macosx64/tryserver/nightly/mozconfig
@@ -1,25 +1,35 @@
 ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
+ac_add_options --disable-auto-deps
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/birch/debug/mozconfig
+++ b/mozilla2/macosx64/birch/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/birch/nightly/mozconfig
+++ b/mozilla2/macosx64/birch/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/cedar/debug/mozconfig
+++ b/mozilla2/macosx64/cedar/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/cedar/nightly/mozconfig
+++ b/mozilla2/macosx64/cedar/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/maple/debug/mozconfig
+++ b/mozilla2/macosx64/maple/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/maple/nightly/mozconfig
+++ b/mozilla2/macosx64/maple/nightly/mozconfig
@@ -10,16 +10,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/mozilla-2.0/debug/mozconfig
+++ b/mozilla2/macosx64/mozilla-2.0/debug/mozconfig
@@ -7,8 +7,16 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2/macosx64/mozilla-2.0/nightly/mozconfig
+++ b/mozilla2/macosx64/mozilla-2.0/nightly/mozconfig
@@ -10,10 +10,18 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/mozilla2/macosx64/mozilla-2.0/release/mozconfig
+++ b/mozilla2/macosx64/mozilla-2.0/release/mozconfig
@@ -8,8 +8,16 @@ export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2/macosx64/mozilla-central/debug/mozconfig
+++ b/mozilla2/macosx64/mozilla-central/debug/mozconfig
@@ -7,8 +7,16 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2/macosx64/mozilla-central/nightly/mozconfig
+++ b/mozilla2/macosx64/mozilla-central/nightly/mozconfig
@@ -10,10 +10,18 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/mozilla2/macosx64/mozilla-central/release/mozconfig
+++ b/mozilla2/macosx64/mozilla-central/release/mozconfig
@@ -8,8 +8,16 @@ export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
--- a/mozilla2/macosx64/tryserver/debug/mozconfig
+++ b/mozilla2/macosx64/tryserver/debug/mozconfig
@@ -7,14 +7,23 @@ ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
-fi
\ No newline at end of file
+fi
--- a/mozilla2/macosx64/tryserver/nightly/mozconfig
+++ b/mozilla2/macosx64/tryserver/nightly/mozconfig
@@ -11,16 +11,25 @@ export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+# To build a 32bit dump_syms but 64bit app, bug 577431
+ac_add_options --host=i386-apple-darwin
+ac_add_options --target=x86_64-apple-darwin
+export HOST_CC="gcc-4.2 -arch i386"
+export HOST_CXX="g++-4.2 -arch i386"
+export CC="gcc-4.2 -arch x86_64"
+export CXX="g++-4.2 -arch x86_64"
+
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-macosx64 ] ; then
   . $topsrcdir/mozconfig-extra-macosx64
 fi