From 21e0ccddd345ad65e6c21d570c8bfc51d0fab6e7 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 14 Aug 2013 18:11:42 -0700 Subject: [PATCH] Bug 905271 - Make ICU compile with -jN (except on Windows). r=glandium --- js/src/Makefile.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 5a736a6109a5..5b515ed1285d 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -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::