Don't build dom/bindings as part of PARALLEL_DIRS, because that seems to parallelize it against dom/bindings/test, which is no good. No bug, r=bustage.
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 31 Aug 2012 14:12:21 -0400
changeset 110338 b96a7ceeb647a2544d41100d145b5e6cc21130bd
parent 110337 bfb57e4e09bb800dade547fa8694698ad7705903
child 110339 82e8e26799383fb3c9699f8e2ea0f9876dae643c
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Don't build dom/bindings as part of PARALLEL_DIRS, because that seems to parallelize it against dom/bindings/test, which is no good. No bug, r=bustage.
dom/Makefile.in
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -39,17 +39,16 @@ PARALLEL_DIRS = \
   interfaces/smil \
   interfaces/apps \
   $(NULL)
 
 PARALLEL_DIRS += \
   apps \
   base \
   activities \
-  bindings \
   battery \
   browser-element \
   contacts \
   alarm \
   devicestorage \
   file \
   media \
   messages \
@@ -86,16 +85,22 @@ PARALLEL_DIRS += \
 endif
 
 ifdef MOZ_PAY
 PARALLEL_DIRS += \
   payment \
   $(NULL)
 endif
 
+# Not in PARALLEL_DIRS because we need to make sure it builds before
+# bindings/test, which builds from TEST_DIRS, which gets appended to DIRS.
+DIRS = \
+  bindings \
+  $(NULL)
+
 # bindings/test is here, because it needs to build after bindings/, and
 # we build subdirectories before ourselves.
 TEST_DIRS += \
   tests \
   imptests \
   bindings/test \
   $(NULL)