Bug 1353640 - Also check sources in the objdir to preprocess generated sources. r?mshal draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 05 Apr 2017 16:39:51 +0900
changeset 556449 c6d687aef4d052552ea2f9f80e1676f2b67431fa
parent 556448 e0b6568e06f2550f9ebb91423548f73be0fff2ca
child 622895 1ae000f775113d948af0c499ea874dfda0cbad46
push id52554
push userbmo:mh+mozilla@glandium.org
push dateWed, 05 Apr 2017 22:14:40 +0000
reviewersmshal
bugs1353640
milestone55.0a1
Bug 1353640 - Also check sources in the objdir to preprocess generated sources. r?mshal
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1025,16 +1025,17 @@ define PREPROCESS_RULES
 _PREPROCESSED_$1_FILES := $$(call _group_srcs,$1,$$($2))
 # Make preprocessed files PHONY so they are always executed, since they are
 # manual targets and we don't necessarily write to $@.
 .PHONY: $$(_PREPROCESSED_$1_FILES)
 
 # Hack up VPATH so we can reach the sources. Eg: 'make Parser.i' may need to
 # reach $(srcdir)/frontend/Parser.i
 vpath %.$1 $$(addprefix $$(srcdir)/,$$(sort $$(dir $$($2))))
+vpath %.$1 $$(addprefix $$(CURDIR)/,$$(sort $$(dir $$($2))))
 
 $$(_PREPROCESSED_$1_FILES): _DEPEND_CFLAGS=
 $$(_PREPROCESSED_$1_FILES): %.i: %.$1
 	$$(REPORT_BUILD_VERBOSE)
 	$$(addprefix $$(MKDIR) -p ,$$(filter-out .,$$(@D)))
 	$$($3) -C $$(PREPROCESS_OPTION)$$@ $(foreach var,$4,$$($(var))) $$($$(notdir $$<)_FLAGS) $$(_VPATH_SRCS)
 
 endef