Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 905271 - Make ICU compile with -jN (except on Windows). r=glandium

Browse Source
This commit is contained in:
Justin Lebar 2013-08-14 18:11:42 -07:00
parent d73a87f56d
commit 21e0ccddd3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/Makefile.in
View File

@ -238,8 +238,14 @@ LOCAL_INCLUDES += \
ifdef ENABLE_INTL_API
ifeq ($(OS_ARCH),WINNT)
# Parallel gmake is buggy on Windows
ICU_GMAKE_OPTIONS="-j1"
# ICU doesn't work with pymake, because pymake doesn't support order-only
# prerequisites.
ifdef .PYMAKE
ICU_MAKE = $(GMAKE)
else
ICU_MAKE = $(MAKE)
endif
# Library names: On Windows, ICU uses modified library names for static
# and debug libraries.
ifdef MOZ_DEBUG
@ -247,6 +253,8 @@ ifeq ($(OS_ARCH),WINNT)
endif
ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
else
ICU_MAKE = $(MAKE)
endif
# - Build ICU as part of the "export" target, so things get built
@ -257,7 +265,7 @@ endif
# will discard all files with a non-standard suffix (bug 857450).
# - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
export::
$(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+$(ICU_MAKE) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
$(ICU_LIB_RENAME)
distclean clean::