Port |Bug 920731 and MOZ_FOLD_LIBS=1| to Instantbird. rs=florian
authorPatrick Cloke <clokep@gmail.com>
Thu, 11 Sep 2014 09:32:12 -0400
changeset 16803 574f4f9a619c
parent 16802 f1fe79198f96
child 16804 bf38e999b0d8
push id10454
push userclokep@gmail.com
push dateMon, 15 Sep 2014 12:44:46 +0000
treeherdercomm-central@574f4f9a619c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs920731
Port |Bug 920731 and MOZ_FOLD_LIBS=1| to Instantbird. rs=florian
im/confvars.sh
--- a/im/confvars.sh
+++ b/im/confvars.sh
@@ -2,19 +2,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_NAME=instantbird
 MOZ_XUL_APP=1
 MOZ_ENABLE_LIBXUL=1
 MOZ_CHROME_FILE_FORMAT=omni
+MOZ_DISABLE_EXPORT_JS=1
 MOZ_UPDATER=1
 MOZ_MATHML=
 MOZ_MEDIA_NAVIGATOR=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 INSTANTBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=im/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/instantbird
 MOZ_APP_ID={33cb9019-c295-46dd-be21-8c4936574bee}
+if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
+  MOZ_FOLD_LIBS=1
+fi