Bug 750669 - Update in-tree mozconfigs for running mac builds on Mac 10.7 based builders. r=jhopkins NPOTB
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 02 May 2012 15:30:55 +0100
changeset 10057 2fa70e9d966edca8d9ed2732fca1f1a8e5b164a6
parent 10056 f1fe5128601ec6d90a056466f1261931363a82f1
child 10058 471262b511783f561bf10db5370694080dcfb7fc
push id7652
push userbugzilla@standard8.plus.com
push dateWed, 02 May 2012 14:50:50 +0000
treeherdercomm-central@2fa70e9d966e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhopkins
bugs750669
Bug 750669 - Update in-tree mozconfigs for running mac builds on Mac 10.7 based builders. r=jhopkins NPOTB
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/macosx-universal/release
mail/config/mozconfigs/macosx32/debug
mail/config/mozconfigs/macosx64/debug
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -4,34 +4,33 @@
 # go away.
 if test -e "$topsrcdir/mail/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
+# Universal builds override the default of mail (bug 575283 comment 29)
 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-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
-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
 
+ac_add_options --with-ccache
+
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx-universal/release
+++ b/mail/config/mozconfigs/macosx-universal/release
@@ -4,30 +4,27 @@
 # go away.
 if test -e "$topsrcdir/mail/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
+# Universal builds override the default of mail (bug 575283 comment 29)
 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-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-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
 
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
 
--- a/mail/config/mozconfigs/macosx32/debug
+++ b/mail/config/mozconfigs/macosx32/debug
@@ -1,21 +1,19 @@
-CC=/usr/bin/gcc-4.2
-CXX=/usr/bin/g++-4.2
-
+. $topsrcdir/build/macosx/mozconfig.leopard
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
-#ac_add_options --with-ccache
+ac_add_options --with-ccache
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -1,29 +1,19 @@
-if test -e "$topsrcdir/mozilla/build/macosx/common"; then
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-fi
-
 . $topsrcdir/build/macosx/common
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
-#ac_add_options --with-ccache
+ac_add_options --with-ccache
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="--hg-options='--verbose --time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1