Bug 746590 - Fix in-tree mozconfigs to specify correct gcc location for Firefox Automation, and add missing mozconfig files - fix mozconfigs to really use a shared file. make check ensures the shared file is kept in sync with FF. r=jhopkins NPOTB DONTBUILD
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 20 Apr 2012 13:33:52 +0100
changeset 11682 950133af840f65c18fec792b3cd10eab7b69db6c
parent 11681 63e28f44e8e6509cfcbd2225ee948b3ed65fd018
child 11683 517d82e4b44645383c1bdebbcb42ee32581096b6
push idunknown
push userunknown
push dateunknown
reviewersjhopkins
bugs746590
Bug 746590 - Fix in-tree mozconfigs to specify correct gcc location for Firefox Automation, and add missing mozconfig files - fix mozconfigs to really use a shared file. make check ensures the shared file is kept in sync with FF. r=jhopkins NPOTB DONTBUILD
build/unix/mozconfig.linux
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
mail/config/mozconfigs/linux64/debug
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
new file mode 100644
--- /dev/null
+++ b/build/unix/mozconfig.linux
@@ -0,0 +1,2 @@
+CC=/tools/gcc-4.5-0moz3/bin/gcc
+CXX=/tools/gcc-4.5-0moz3/bin/g++
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -3,18 +3,17 @@ ac_add_options --enable-debug
 ac_add_options --disable-optimize
 ac_add_options --enable-tests
 
 ac_add_options --enable-trace-malloc
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # 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,18 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -1,18 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -3,18 +3,17 @@ ac_add_options --enable-debug
 ac_add_options --disable-optimize
 ac_add_options --enable-tests
 
 ac_add_options --enable-trace-malloc
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # 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/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,18 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -1,18 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-CC=/tools/gcc-4.5-0moz3/bin/gcc
-CXX=/tools/gcc-4.5-0moz3/bin/g++
+. $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini