[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Disable ICU when cross-compiling; clean-up.

[mikeperry at torproject.org]

commit f7a88a9e7c50eb440a6b3e6f548f715018918868
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 22 11:00:52 2014 +0000

    Disable ICU when cross-compiling; clean-up.
---
 .mozconfig-mac   |    8 ++++----
 .mozconfig-mingw |    3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.mozconfig-mac b/.mozconfig-mac
index 01ed601..4abcc7c 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -10,9 +10,6 @@ FLAGS="-arch i386 -isysroot $SYSROOTDIR"
 # complaining with this patch on compile time anymore it won't start...
 # CROSS_PRIVATE_FRAMEWORKS=$SYSROOTDIR/System/Library/PrivateFrameworks
 
-# Needed for our otool patch
-TOOLCHAIN_PREFIX=x86_64-apple-darwin10-
-
 CC="$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS"
 CXX="$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS"
 
@@ -38,11 +35,14 @@ ac_add_options --disable-debug
 
 # See above for a reason why this is currently disabled
 # ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
-#ac_add_options --disable-updater
+
 ac_add_options --enable-tor-browser-update
 ac_add_options --enable-update-packaging
 # We do not use signed MAR files yet (Mozilla uses them on Windows only).
 ac_add_options --disable-verify-mar
+
+# ICU seems still to have cross-compiling issues:
+ac_add_options --without-intl-api
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index b4432e2..691178b 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -19,6 +19,9 @@ ac_add_options --enable-update-packaging
 # We do not use signed MAR files yet (Mozilla uses them on Windows only).
 ac_add_options --disable-verify-mar
 
+# ICU seems still to have cross-compiling issues:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19
+ac_add_options --without-intl-api
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc