mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 947981 - broken --with-system-icu build. r=glandium
This commit is contained in:
parent
952359059e
commit
9deffbbcc6
@ -3914,6 +3914,7 @@ MOZ_ARG_WITH_BOOL(system-icu,
|
||||
if test -n "$MOZ_NATIVE_ICU"; then
|
||||
PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
|
||||
MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
|
||||
MOZ_SHARED_ICU=1
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_NATIVE_ICU)
|
||||
|
@ -36,7 +36,6 @@ export:: \
|
||||
$(call mkdir_deps,system_wrappers_js) \
|
||||
$(NULL)
|
||||
$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
|
||||
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
|
||||
$(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
|
||||
$(INSTALL) system_wrappers_js $(DIST)
|
||||
|
||||
|
@ -4165,6 +4165,7 @@ MOZ_ARG_WITH_BOOL(system-icu,
|
||||
|
||||
if test -n "$MOZ_NATIVE_ICU"; then
|
||||
PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
|
||||
MOZ_SHARED_ICU=1
|
||||
fi
|
||||
|
||||
MOZ_ARG_WITH_STRING(intl-api,
|
||||
|
Loading…
Reference in New Issue
Block a user