From 75a8d98fa37b7e487e0f87fed7a0bdd792ad119b Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sat, 4 Oct 2014 10:34:35 +0900 Subject: [PATCH] Bug 1077228 - Include the right autoconf.mk in GLOBAL_DEPS. r=mshal Ever since bug 969164, the js build system, when building gecko (not when building standalone) uses a autoconf-js.mk file for its config. One of the suboptimal ways we have to retrigger builds when the build configuration changes (changes to e.g. configure.in can do that) is to make most things depend on autoconf.mk. Which unfortunately doesn't account for the fact the js/src subdirectory uses a different file. In practice, this means that some classes of changes to the js build system, not accompanied with toplevel build system changes may no trigger the corresponding rebuilds in the js subtree on incremental builds. --- config/autoconf-js.mk.in | 2 +- config/autoconf.mk.in | 2 +- config/rules.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/autoconf-js.mk.in b/config/autoconf-js.mk.in index 4ba6645e87a3b..ae4ad2c5e11b4 100644 --- a/config/autoconf-js.mk.in +++ b/config/autoconf-js.mk.in @@ -1,5 +1,5 @@ ifndef INCLUDED_AUTOCONF_MK -INCLUDED_AUTOCONF_MK = 1 +INCLUDED_AUTOCONF_MK = autoconf-js.mk include $(DEPTH)/config/emptyvars-js.mk @ALLSUBSTS@ include $(topsrcdir)/config/baseconfig.mk diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index df6cc89badb74..fb52bc19753c7 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -1,5 +1,5 @@ ifndef INCLUDED_AUTOCONF_MK -INCLUDED_AUTOCONF_MK = 1 +INCLUDED_AUTOCONF_MK = autoconf.mk include $(DEPTH)/config/emptyvars.mk @ALLSUBSTS@ include $(topsrcdir)/config/baseconfig.mk diff --git a/config/rules.mk b/config/rules.mk index 99b168452c4f0..33385626e94ad 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -572,7 +572,7 @@ STATIC_LIB_DEP = $(if $(wildcard $(1).$(LIBS_DESC_SUFFIX)),$(1).$(LIBS_DESC_SUFF STATIC_LIBS_DEPS := $(foreach l,$(STATIC_LIBS),$(call STATIC_LIB_DEP,$(l))) # Dependencies which, if modified, should cause everything to rebuild -GLOBAL_DEPS += Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk +GLOBAL_DEPS += Makefile $(addprefix $(DEPTH)/config/,$(INCLUDED_AUTOCONF_MK)) $(topsrcdir)/config/config.mk ############################################## ifdef COMPILE_ENVIRONMENT