Bug 1035087 - Avoid recursing some "binaries" targets when recursing for "libs". r=gps,a=nigelb
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 08 Jul 2014 13:47:24 +0900
changeset 213494 c45f6e6d6005ce895befc0242c427d5f71eacea5
parent 213493 7f9db2379b3f932a3d2b2d83d922fd76d9152d8e
child 213514 465280604ea6edd9e64e4f05e88b7e81ac99dee6
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, nigelb
bugs1035087
milestone33.0a1
first release with
nightly linux32
c45f6e6d6005 / 33.0a1 / 20140708030203 / files
nightly linux64
c45f6e6d6005 / 33.0a1 / 20140708030203 / files
nightly mac
c45f6e6d6005 / 33.0a1 / 20140708030203 / files
nightly win32
c45f6e6d6005 / 33.0a1 / 20140708030203 / files
nightly win64
c45f6e6d6005 / 33.0a1 / 20140708030203 / 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
Bug 1035087 - Avoid recursing some "binaries" targets when recursing for "libs". r=gps,a=nigelb
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -116,18 +116,18 @@ ifneq (,$(filter libs binaries,$(CURRENT
 # gyp managed ones and js/src.
 # A few things that are not traversed by a "binaries" build, but should, in an ideal
 # world, are nspr, nss, icu and ffi.
 recurse_$(CURRENT_TIER):
 	@$(MAKE) binaries-deps
 
 # Creating binaries-deps.mk directly would make us build it twice: once when beginning
 # the build because of the include, and once at the end because of the stamps.
-binaries-deps: $(addsuffix /binaries,$(CURRENT_DIRS))
-	@$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ',$(addsuffix ',$^)))
+binaries-deps:
+	@$(call py_action,link_deps,-o $@.mk --group-by-depfile --topsrcdir $(topsrcdir) --topobjdir $(DEPTH) --dist $(DIST) --guard $(addprefix ',$(addsuffix ', $(wildcard $(addsuffix /binaries,$(CURRENT_DIRS))))))
 	@$(TOUCH) $@
 
 ifeq (recurse_binaries,$(MAKECMDGOALS))
 $(call include_deps,binaries-deps.mk)
 endif
 
 endif