Bug 1242074 - Fix top-level install-dist_% rules; r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 23 Jan 2016 11:39:18 -0800
changeset 316466 8acdf3c85c6aaf30f564094b84b7514ade7a3386
parent 316465 6e3530547a818177ff0e100d2f0d34ee2bc53618
child 316467 1378b39a9085890ce142e6933ebd50b6537f4ec5
push id5703
push userraliiev@mozilla.com
push dateMon, 07 Mar 2016 14:18:41 +0000
treeherdermozilla-beta@31e373ad5b5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1242074
milestone46.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
Bug 1242074 - Fix top-level install-dist_% rules; r=gps For some reason, recent changes with the install-dist/% rules broke the dummy wrapper used by `mach build faster`, leading to `Nothing to be done for install-dist_idl.`, subsequently failing to build xpt files because of the missing idls in dist/idl.
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,17 +176,17 @@ ifneq (,$(filter FasterMake+RecursiveMak
 	@# If we're using the hybrid FasterMake/RecursiveMake backend, we want
 	@# to ensure the FasterMake end doesn't have install manifests for the
 	@# same directory, because that would blow up
 	$(if $(wildcard _build_manifests/install/$(subst /,_,$*)),$(if $(wildcard faster/install_$(subst /,_,$*)*),$(error FasterMake and RecursiveMake ends of the hybrid build system want to handle $*)))
 endif
 	$(addprefix $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))
 
 # Dummy wrapper rule to allow the faster backend to piggy back
-install-dist_%: install-dist/% ;
+$(addprefix install-,$(subst /,_,$(filter dist/%,$(install_manifests)))): install-dist_%: install-dist/% ;
 
 # For compatibility
 .PHONY: install-tests
 install-tests: install-_tests
 
 include $(topsrcdir)/build/moz-automation.mk
 
 # dist and _tests should be purged during cleaning. However, we don't want them