[tor-commits] [torbrowser/maint-2.2] add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig

[erinn at torproject.org]

commit e6f79a5dad3bdfe037673e44ba43e18ec1026a50
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Oct 11 16:16:07 2011 +0100

    add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig
---
 build-scripts/config/dot_mozconfig        |    1 +
 build-scripts/config/mozconfig-osx-i386   |    2 --
 build-scripts/config/mozconfig-osx-x86_64 |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig
index 934e4f4..9333a6f 100755
--- a/build-scripts/config/dot_mozconfig
+++ b/build-scripts/config/dot_mozconfig
@@ -4,5 +4,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
 mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser
 
 ac_add_options --enable-optimize
+ac_add_options --enable-strip
 ac_add_options --disable-tests
 ac_add_options --disable-debug
diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386
index 231bb9e..ffc90c5 100644
--- a/build-scripts/config/mozconfig-osx-i386
+++ b/build-scripts/config/mozconfig-osx-i386
@@ -23,8 +23,6 @@ ac_add_options --target=i386-apple-darwin$DARWIN_VERSION
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_add_options --enable-macos-target=10.5
 ac_add_options --enable-application=browser
-ac_add_options --enable-update-packaging
-ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --disable-debug
diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64
index f62f68b..febba50 100755
--- a/build-scripts/config/mozconfig-osx-x86_64
+++ b/build-scripts/config/mozconfig-osx-x86_64
@@ -23,5 +23,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --enable-application=browser
 ac_add_options --enable-libzul
 ac_add_options --enable-optimize
+ac_add_options --enable-strip
 ac_add_options --disable-tests
 ac_add_options --disable-debug