Bug 1075758 - Remove local patch to not override CC/CXX when building with *BSD -- patch landed upstream. r=glandium
authorJeff Walden <jwalden@mit.edu>
Fri, 12 Jun 2015 14:25:23 -0700
changeset 250729 addddfefa2e8b0ca1a2c94d8076b72421e970ab0
parent 250728 c76364c9a1d07ed188b0fdb02f895877a7569923
child 250730 e575191a567bdef4a4d12c5ccbb87a1ef838340b
push id28968
push userkwierso@gmail.com
push dateTue, 30 Jun 2015 23:40:44 +0000
treeherdermozilla-central@e5ef71b73fec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1075758
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1075758 - Remove local patch to not override CC/CXX when building with *BSD -- patch landed upstream. r=glandium
intl/icu-patches/bug-899722-4
intl/update-icu.sh
deleted file mode 100644
--- a/intl/icu-patches/bug-899722-4
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs.
-
-diff --git a/intl/icu/source/runConfigureICU b/intl/icu/source/runConfigureICU
---- a/intl/icu/source/runConfigureICU
-+++ b/intl/icu/source/runConfigureICU
-@@ -329,8 +329,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_CXXFLAGS='-g -O0'
-         ;;
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -47,16 +47,15 @@ rm ${icu_dir}/source/data/translit/*
 # repository (not just the path within it we care about) receives a commit.
 # (This ensures that if ICU modifications are performed properly, it's always
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 exit 0
 
-patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-4
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/genrb-omitCollationRules.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/clang-cl.diff
 
 hg addremove ${icu_dir}