From 778c2bd873a0474c87e1f9a755f5c0d1d3a60ae7 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Mon, 3 Mar 2014 22:38:55 -0500 Subject: [PATCH] Bug 978784 - Stop exporting ICU symbols from xul.dll; r=glandium --- CLOBBER | 2 +- build/autoconf/icu.m4 | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CLOBBER b/CLOBBER index 468558ab8ac..98f0cb22dfa 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # 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. diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 2dcf93eada0..4a4f5e8b567 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -119,11 +119,8 @@ 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. @@ -140,6 +137,12 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then # Set ICU compile options ICU_CPPFLAGS="" + 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 + ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_STATIC_IMPLEMENTATION" + else + ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_COMBINED_IMPLEMENTATION" + fi # don't use icu namespace automatically in client code ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0" # don't include obsolete header files