mozilla-beta: changeset 305159:ca648290f7de761db027f1a8465d138b1f7a654f

author	Chris Manchester <cmanchester@mozilla.com>
	Tue, 03 Nov 2015 10:23:04 -0800
changeset 305159	ca648290f7de761db027f1a8465d138b1f7a654f
parent 305158	ce0741b494a70915a451fda9378a20816319ee3c
child 305160	3326214cc3c79155147341bef00fcf1925463b6b
push id	5513
push user	raliiev@mozilla.com
push date	Mon, 25 Jan 2016 13:55:34 +0000
treeherder	mozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	1220000
milestone	45.0a1
first release with	nightly linux32 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly linux64 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly mac 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly win32 6077f51254c6 / 45.0a1 / 20151104030437 / files nightly win64 6077f51254c6 / 45.0a1 / 20151104030437 / files
last release without	nightly linux32 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly linux64 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly mac bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly win32 bb4d614a0b09 / 45.0a1 / 20151103030248 / files nightly win64 bb4d614a0b09 / 45.0a1 / 20151103030248 / files

Bug 1220000 - Unconditionally include EXTRA_MDDEPEND_FILES so callers get what they expect. r=glandium GENERATED_FILES and accessible/xpcom/Makefile.in add to EXTRA_MDDEPEND_FILES, but for targets that run during export. Export doesn't include EXTRA_MDDEPEND_FILES, so none of them is ending up with correct dependencies. The EXTRA_EXPORT_MDDEPEND_FILES variable could be used for this purpose, but given the circumstances this variable is removed, and EXTRA_MDDEPEND_FILES is instead included unconditionally.

--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1336,34 +1336,30 @@ endif
 #
 #   We use $(CURDIR) in the rule's target to ensure that we don't find
 #   a dependency directory in the source tree via VPATH (perhaps from
 #   a previous build in the source tree) and thus neglect to create a
 #   dependency directory in the object directory, where we really need
 #   it.
 
 ifneq (,$(filter-out all chrome default export realchrome clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES) $(addsuffix .pp,$(notdir $(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS)))))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(addsuffix .pp,$(notdir $(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS)))))))
 
 ifneq (,$(MDDEPEND_FILES))
 $(call include_deps,$(MDDEPEND_FILES))
 endif
 
 endif
 
-
-ifneq (,$(filter export,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(EXTRA_EXPORT_MDDEPEND_FILES))))
+MDDEPEND_FILES		:= $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 $(call include_deps,$(MDDEPEND_FILES))
 endif
 
-endif
-
 #############################################################################
 
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-rules.mk
 -include $(MY_RULES)
 
 #
 # Generate Emacs tags in a file named TAGS if ETAGS was set in $(MY_CONFIG)
 # or in $(MY_RULES)