Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs. r=glandium
authorJan Beich <jbeich@tormail.org>
Tue, 20 Aug 2013 16:42:42 -0400
changeset 143614 16eed749e8aba395fb3eb16de9875c5faa81db7b
parent 143613 1d29b04fc7c347ed3e41020c65fc69011970e14b
child 143615 c4fb173290bbddfc3c327075f25bfbbfa9a7ca4f
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs899722
milestone26.0a1
Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs. r=glandium
intl/icu-patches/bug-899722-4
intl/icu/source/runConfigureICU
intl/update-icu.sh
new file mode 100644
--- /dev/null
+++ b/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
--- 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
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -37,10 +37,11 @@ rm ${icu_dir}/source/data/translit/*
 
 # Record `svn info`
 svn info $1 > ${icu_dir}/SVN-INFO
 
 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}