Bug 575283 - Remove redundant/invalid options from the now in-tree mozconfigs; r=catlee,ted
authorEd Morley <bmo@edmorley.co.uk>
Fri, 14 Oct 2011 22:25:01 +0100
changeset 80154 788f62b4e539892a53c53d252763f35530d19ee0
parent 80153 9a6b5bf1a10d4ebcb4a2150f16ecaee40f3d056e
child 80155 3b58a9df4c8cf6d95af64d2a64b4f10c339b0d2c
child 80160 f861fcef59dacf17cda0d168a1852f91c3659f50
push id434
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 12:10:54 +0000
treeherdermozilla-beta@bddb6ed8dd47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee, ted
bugs575283
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 575283 - Remove redundant/invalid options from the now in-tree mozconfigs; r=catlee,ted Removes options that are now set by default (eg enable symbols, app=browser) and those that have since been removed from configure (eg --disable-javaxpcom). Also removes |--enable-jemalloc| if |--enable-trace-malloc| present, since the latter force disables jemalloc regardless. Note: This changeset is effectively no-op. No behaviour change is intended.
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux32/nightly
browser/config/mozconfigs/linux32/qt
browser/config/mozconfigs/linux32/release
browser/config/mozconfigs/linux32/rpm
browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/linux64/nightly
browser/config/mozconfigs/linux64/release
browser/config/mozconfigs/linux64/rpm
browser/config/mozconfigs/macosx-universal/nightly
browser/config/mozconfigs/macosx-universal/release
browser/config/mozconfigs/macosx-universal/shark
browser/config/mozconfigs/macosx32/debug
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/win32/debug
browser/config/mozconfigs/win32/l10n-mozconfig
browser/config/mozconfigs/win32/nightly
browser/config/mozconfigs/win32/release
browser/config/mozconfigs/win64/debug
browser/config/mozconfigs/win64/nightly
mobile/config/mozconfigs/android/debug
mobile/config/mozconfigs/android/nightly
mobile/config/mozconfigs/linux-desktop/nightly
mobile/config/mozconfigs/macosx-desktop/nightly
mobile/config/mozconfigs/win32-desktop/nightly
xulrunner/config/mozconfigs/linux32/xulrunner
xulrunner/config/mozconfigs/linux32/xulrunner-qt
xulrunner/config/mozconfigs/linux64/xulrunner
xulrunner/config/mozconfigs/macosx-universal/xulrunner
xulrunner/config/mozconfigs/win32/xulrunner
xulrunner/config/mozconfigs/win64/xulrunner
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -1,28 +1,16 @@
-ac_add_options --enable-application=browser
-
 ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,8 +1,7 @@
 ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=browser
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
--- a/browser/config/mozconfigs/linux32/nightly
+++ b/browser/config/mozconfigs/linux32/nightly
@@ -1,31 +1,20 @@
-ac_add_options --enable-application=browser
-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-codesighs
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
--- a/browser/config/mozconfigs/linux32/qt
+++ b/browser/config/mozconfigs/linux32/qt
@@ -1,28 +1,16 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-
 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/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/browser/config/mozconfigs/linux32/release
+++ b/browser/config/mozconfigs/linux32/release
@@ -1,28 +1,17 @@
-ac_add_options --enable-application=browser
-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/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # PGO
 mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/browser/config/mozconfigs/linux32/rpm
+++ b/browser/config/mozconfigs/linux32/rpm
@@ -1,36 +1,24 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-
 ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
 # Options for rpm versions of mozconfigs
 PREFIX=/usr
 LIBDIR=${PREFIX}/lib
 ac_add_options --with-app-name=mozilla-nightly
 ac_add_options --disable-updater
 ac_add_options --prefix=$PREFIX
 ac_add_options --libdir=$LIBDIR
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 
 export MOZ_TELEMETRY_REPORTING=1
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -1,24 +1,13 @@
-ac_add_options --enable-application=browser
-
 ac_add_options --enable-debug
-
-ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-#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
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,8 +1,7 @@
 ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=browser
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
 CC=/tools/gcc/bin/gcc
 CXX=/tools/gcc/bin/g++
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@@ -1,31 +1,20 @@
-ac_add_options --enable-application=browser
-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-codesighs
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
--- a/browser/config/mozconfigs/linux64/release
+++ b/browser/config/mozconfigs/linux64/release
@@ -1,28 +1,17 @@
-ac_add_options --enable-application=browser
-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/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # PGO
 mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/browser/config/mozconfigs/linux64/rpm
+++ b/browser/config/mozconfigs/linux64/rpm
@@ -1,36 +1,24 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-
 ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 
 # Options for rpm versions of mozconfigs
 PREFIX=/usr
 LIBDIR=${PREFIX}/lib64
 ac_add_options --with-app-name=mozilla-nightly
 ac_add_options --disable-updater
 ac_add_options --prefix=$PREFIX
 ac_add_options --libdir=$LIBDIR
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-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
 
 export MOZ_TELEMETRY_REPORTING=1
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -1,24 +1,18 @@
 . $topsrcdir/build/macosx/universal/mozconfig
 
+# Universal builds override the default of browser (bug 575283 comment 29)
 ac_add_options --enable-application=browser
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-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
 
 export MOZ_TELEMETRY_REPORTING=1
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/browser/config/mozconfigs/macosx-universal/release
+++ b/browser/config/mozconfigs/macosx-universal/release
@@ -1,19 +1,13 @@
 . $topsrcdir/build/macosx/universal/mozconfig
 
+# Universal builds override the default of browser (bug 575283 comment 29)
 ac_add_options --enable-application=browser
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-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
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/browser/config/mozconfigs/macosx-universal/shark
+++ b/browser/config/mozconfigs/macosx-universal/shark
@@ -1,28 +1,22 @@
 # Just like nightlies, but without tests, not on an update channel, and with
 # shark and dtrace enabled
 . $topsrcdir/build/macosx/universal/mozconfig
 
+# Universal builds override the default of browser (bug 575283 comment 29)
 ac_add_options --enable-application=browser
+
 ac_add_options --disable-tests
 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
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # shark specific options
 ac_add_options --enable-shark
 ac_add_options --enable-dtrace
-ac_add_options --enable-debugger-info-modules
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL="shark"
--- a/browser/config/mozconfigs/macosx32/debug
+++ b/browser/config/mozconfigs/macosx32/debug
@@ -1,21 +1,12 @@
 # Don't use the standard mozconfig. We don't want universal for a debug build. 
 #. $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
 ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-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"
-
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -1,17 +1,9 @@
 ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-accessibility
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,5 +1,4 @@
 ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=browser
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -1,14 +1,7 @@
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
 ac_add_options --enable-debug
-ac_add_options --enable-libxul
 ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,5 +1,4 @@
-ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=../../l10n-central
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -1,21 +1,16 @@
 # for pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
-ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -1,18 +1,13 @@
 # for pgo
 mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
-ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
 ac_add_options --enable-official-branding
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -1,13 +1,10 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-ac_add_options --enable-application=browser
-ac_add_options --enable-jemalloc
 ac_add_options --enable-debug
-ac_add_options --enable-libxul
 ac_add_options --enable-trace-malloc
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -1,19 +1,17 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 # for pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
-ac_add_options --enable-application=browser
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-ac_add_options --enable-debug-symbols
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/config/mozconfigs/android/debug
+++ b/mobile/config/mozconfigs/android/debug
@@ -9,14 +9,13 @@ ac_add_options --enable-application=mobi
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/branding/nightly
--- a/mobile/config/mozconfigs/android/nightly
+++ b/mobile/config/mozconfigs/android/nightly
@@ -1,28 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
-ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/branding/nightly
--- a/mobile/config/mozconfigs/linux-desktop/nightly
+++ b/mobile/config/mozconfigs/linux-desktop/nightly
@@ -1,14 +1,12 @@
 mk_add_options MOZ_PKG_FORMAT=BZ2
-ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
--- a/mobile/config/mozconfigs/macosx-desktop/nightly
+++ b/mobile/config/mozconfigs/macosx-desktop/nightly
@@ -3,15 +3,13 @@ mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
 ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
--- a/mobile/config/mozconfigs/win32-desktop/nightly
+++ b/mobile/config/mozconfigs/win32-desktop/nightly
@@ -1,17 +1,13 @@
 # Options for client.mk.
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
-ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
-ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
 ac_add_options --disable-webm
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-ac_add_options --enable-debug-symbols
 export MOZILLA_OFFICIAL=1
--- a/xulrunner/config/mozconfigs/linux32/xulrunner
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner
@@ -1,15 +1,11 @@
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/tools/jdk
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
--- a/xulrunner/config/mozconfigs/linux32/xulrunner-qt
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
@@ -1,15 +1,11 @@
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/tools/jdk
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
@@ -19,9 +15,8 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # QT Options
 export PKG_CONFIG_PATH=/tools/qt-4.6.3/qt/lib/pkgconfig
 ac_add_options --with-qtdir=/tools/qt-4.6.3/qt
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
-
--- a/xulrunner/config/mozconfigs/linux64/xulrunner
+++ b/xulrunner/config/mozconfigs/linux64/xulrunner
@@ -1,15 +1,11 @@
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/tools/jdk
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
--- a/xulrunner/config/mozconfigs/macosx-universal/xulrunner
+++ b/xulrunner/config/mozconfigs/macosx-universal/xulrunner
@@ -1,13 +1,9 @@
 . $topsrcdir/build/macosx/universal/mozconfig
 
 export MOZILLA_OFFICIAL=1
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-tests
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/xulrunner/config/mozconfigs/win32/xulrunner
+++ b/xulrunner/config/mozconfigs/win32/xulrunner
@@ -1,12 +1,9 @@
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/d/jdk1.6.0_14
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-jemalloc
 ac_add_options --disable-installer
 ac_add_options --disable-tests
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
--- a/xulrunner/config/mozconfigs/win64/xulrunner
+++ b/xulrunner/config/mozconfigs/win64/xulrunner
@@ -3,11 +3,10 @@ ac_add_options --host=x86_64-pc-mingw32
 
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/d/jdk1.6.0_14
 
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-jemalloc
 ac_add_options --disable-installer
 ac_add_options --disable-tests
-ac_add_options --enable-debug-symbols
 
 mk_add_options MOZ_MAKE_FLAGS=-j1