Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs. r=glandium

intl/icu-patches/bug-899722-4

@@ -0,0 +1,25 @@
+Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs.
+
+diff --git a/intl/icu/source/runConfigureICU b/intl/icu/source/runConfigureICU
+index 1a476ff..8873cc3 100755
+--- a/intl/icu/source/runConfigureICU
++++ b/intl/icu/source/runConfigureICU
+@@ -293,18 +293,16 @@ case $platform in
+         RELEASE_CXXFLAGS='-Gy -MD'
+         DEBUG_CFLAGS='-Zi -MDd'
+         DEBUG_CXXFLAGS='-Zi -MDd'
+         DEBUG_LDFLAGS='-DEBUG'
+         ;;
+     *BSD)
+         THE_OS="BSD"
+         THE_COMP="the GNU C++"
+-        CC=gcc; export CC
+-        CXX=g++; export CXX
+         DEBUG_CFLAGS='-g -O0'
+         DEBUG_CXFLAGS='-g -O0'
+         ;;
+     TRU64V5.1/CXX)
+         THE_OS="OSF1"
+         THE_COMP="Compaq cxx"
+         CC=cc; export CC
+         CXX=cxx; export CXX

intl/icu/source/runConfigureICU

@@ -298,8 +298,6 @@ case $platform in
     *BSD)
         THE_OS="BSD"
         THE_COMP="the GNU C++"
-        CC=gcc; export CC
-        CXX=g++; export CXX
         DEBUG_CFLAGS='-g -O0'
         DEBUG_CXFLAGS='-g -O0'
         ;;

intl/update-icu.sh

@@ -42,5 +42,6 @@ patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-853706
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-2
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-4
 
 hg addremove ${icu_dir}