intl/icu-patches/bug-899722-4
author Matt Woodrow <mwoodrow@mozilla.com>
Thu, 30 Jan 2014 18:41:17 +1300
changeset 176137 9737a63a47cf0774e1744cf88f45f01c165054d6
parent 157441 16eed749e8aba395fb3eb16de9875c5faa81db7b
child 183153 6e956de758ce84dfb882c82c988626b41e390630
permissions -rw-r--r--
Bug 946952 - Run a 'compressed' paint up to 1 second after skipping the ColorLayer optimization. r=roc, a=1.3+

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