Bug 978784 - Stop exporting ICU symbols from xul.dll; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 04 Mar 2014 10:42:54 -0500
changeset 171802 d421723d3a0fea8f9506c651436489e74ede7098
parent 171801 164ee18c1ac749300b3795898cf08929bbb86f19
child 171803 a20b86f52b7cb74d6057bb5585c0363e2accfb4c
push id26340
push userryanvm@gmail.com
push dateTue, 04 Mar 2014 22:12:36 +0000
treeherdermozilla-central@e5b09585215f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs978784
milestone30.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 978784 - Stop exporting ICU symbols from xul.dll; r=glandium
CLOBBER
build/autoconf/icu.m4
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Update CLOBBER for bug 939672 moves file location and requires clobber build.
+Update CLOBBER for bug 978784 because it touches the ICU build system.
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -117,18 +117,16 @@ AC_SUBST(DBG_SUFFIX)
 AC_SUBST(ENABLE_INTL_API)
 AC_SUBST(ICU_LIB_NAMES)
 AC_SUBST(MOZ_ICU_LIBS)
 
 if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
     dnl We build ICU as a static library for non-shared js builds and as a shared library for shared js builds.
     if test -z "$MOZ_SHARED_ICU"; then
         AC_DEFINE(U_STATIC_IMPLEMENTATION)
-    else
-        AC_DEFINE(U_COMBINED_IMPLEMENTATION)
     fi
     dnl Source files that use ICU should have control over which parts of the ICU
     dnl namespace they want to use.
     AC_DEFINE(U_USING_ICU_NAMESPACE,0)
 fi
 
 
 ])