Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 47afb5f53400 (bug 978784) because it's still busted with a clobber

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2014-03-03 21:26:19 -08:00
parent 3e9d3c59e3
commit c2c338a253
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -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 978784 because it touches the ICU build system.
Update CLOBBER for bug 939672 moves file location and requires clobber build.

9
build/autoconf/icu.m4
View File

@ -119,8 +119,11 @@ 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.
@ -137,12 +140,6 @@ 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