Backed out changeset e8bcb131ca7c (bug 905271) for suspicion of causing intermittent build bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 15 Aug 2013 15:41:53 -0400
changeset 155676 1ed5a88cd4d017c47e84d2f0eda4abf317d6dfe6
parent 155675 929b786b99933b43753a1c16bc0b991ab2c88780
child 155703 bc51f3691c07847b55d564e6a0480d652f0a487e
child 155752 86307a178e3fb26edbba06cb1f43d5e700e3af72
child 155763 a4ad940ec6cec67a901b5a726e4c6594226abb89
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs905271
milestone26.0a1
backs oute8bcb131ca7c161a282945df9dc56d5ce4228325
first release with
nightly linux32
1ed5a88cd4d0 / 26.0a1 / 20130816030205 / files
nightly linux64
1ed5a88cd4d0 / 26.0a1 / 20130816030205 / files
nightly mac
1ed5a88cd4d0 / 26.0a1 / 20130816030205 / files
nightly win32
1ed5a88cd4d0 / 26.0a1 / 20130816030205 / files
nightly win64
1ed5a88cd4d0 / 26.0a1 / 20130816030205 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e8bcb131ca7c (bug 905271) for suspicion of causing intermittent build bustage.
js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -233,44 +233,36 @@ endif
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/../../intl/icu/source/common \
   -I$(topsrcdir)/../../intl/icu/source/i18n \
   $(NULL)
 
 ifdef ENABLE_INTL_API
 
 ifeq ($(OS_ARCH),WINNT)
-  # ICU doesn't work with pymake, because pymake doesn't support order-only
-  # prerequisites.
-  ifdef .PYMAKE
-    ICU_MAKE = $(GMAKE)
-  else
-    ICU_MAKE = $(MAKE)
-  endif
-
+  # Parallel gmake is buggy on Windows
+  ICU_GMAKE_OPTIONS="-j1"
   # Library names: On Windows, ICU uses modified library names for static
   # and debug libraries.
   ifdef MOZ_DEBUG
     ICU_LIB_SUFFIX=d
   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
 #   in the right order.
 # - ICU requires GNU make according to its readme.html. pymake can't be used
 #   because it doesn't support order only dependencies.
 # - Force ICU to use the standard suffix for object files because expandlibs
 #   will discard all files with a non-standard suffix (bug 857450).
 # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
 export::
-	+$(ICU_MAKE) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+	$(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
 	$(ICU_LIB_RENAME)
 
 distclean clean::
 	$(call SUBMAKE,$@,intl/icu)
 
 endif
 
 #