Bug 1209403 - Build xpidl stuff in the faster make backend. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Sep 2015 17:18:45 +0900
changeset 265167 a775aa12120ae6db7cb082c7a180187356c3fbcd
parent 265166 0eedb958866d1872ff737d8f08142d73b0bdd684
child 265168 8b11ccff38b276358515dabd53ce5c0cfad8fbb5
push id15432
push usercbook@mozilla.com
push dateWed, 30 Sep 2015 11:55:00 +0000
treeherderfx-team@4eb1b72f16f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1209403
milestone44.0a1
Bug 1209403 - Build xpidl stuff in the faster make backend. r=gps
Makefile.in
config/faster/rules.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,16 +127,19 @@ install-manifests: $(addprefix install-,
 ifdef JS_STANDALONE
 NO_REMOVE=1
 endif
 
 .PHONY: $(addprefix install-,$(install_manifests))
 $(addprefix install-,$(filter dist/%,$(install_manifests))): install-dist/%: $(install_manifest_depends)
 	$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$*)
 
+# Dummy wrapper rule to allow the faster backend to piggy back
+install-dist_%: install-dist/% ;
+
 install-_tests: $(install_manifest_depends)
 	$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )_tests _build_manifests/install/tests)
 
 # For compatibility
 .PHONY: install-tests
 install-tests: install-_tests
 
 include $(topsrcdir)/build/moz-automation.mk
--- a/config/faster/rules.mk
+++ b/config/faster/rules.mk
@@ -48,16 +48,19 @@ default: $(addprefix jar-,$(JAR_MN_TARGE
 
 # Explicit files to be built for a default build
 default: $(addprefix $(TOPOBJDIR)/,$(PP_TARGETS))
 default: $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS))
 default: $(TOPOBJDIR)/dist/bin/greprefs.js
 default: $(TOPOBJDIR)/dist/bin/platform.ini
 default: $(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini
 
+# Targets from the recursive make backend to be built for a default build
+default: $(TOPOBJDIR)/config/makefiles/xpidl/xpidl
+
 .PHONY: FORCE
 
 # Extra define to trigger some workarounds. We should strive to limit the
 # use of those. As of writing the only one is in
 # toolkit/content/buildconfig.html.
 ACDEFINES += -DBUILD_FASTER
 
 # Generic rule to fall back to the recursive make backend
@@ -193,8 +196,12 @@ jar-browser-themes-%-jar.mn: \
 $(TOPOBJDIR)/dist/bin/application.ini: $(TOPOBJDIR)/config/buildid
 $(TOPOBJDIR)/dist/bin/application.ini: defines += \
 	-DAPP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid)
 
 # Files to build with the recursive backend and simply copy
 $(TOPOBJDIR)/dist/bin/greprefs.js: $(TOPOBJDIR)/modules/libpref/greprefs.js
 $(TOPOBJDIR)/dist/bin/platform.ini: $(TOPOBJDIR)/toolkit/xre/platform.ini
 $(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini: $(TOPOBJDIR)/webapprt/webapprt.ini
+
+# The xpidl target in config/makefiles/xpidl requires the install manifest for
+# dist/idl to have been processed.
+$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(TOPOBJDIR)/install-dist_idl