1040649 - Detect changes to frozen variables between rules.mk include and the end of Makefile.in

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

We have a bunch of Makefiles that include rules.mk and do things after that. It would be better to check they don't change frozen variables. Fortunately, we have another file included after everything from the Makefile.in: recurse.mk (that include is added by the recursemake backend).

Comment 1

[Mike Hommey [:glandium]]

Attachment: Detect changes to frozen variables between rules.mk include and the end of Makefile.in

Comment 2

[Michael Shal [:mshal]]

Comment on attachment 8458533 [details] [diff] [review]
Detect changes to frozen variables between rules.mk include and the end of Makefile.in

>+# Make sure that anything that needs to be defined in moz.build wasn't
>+# overwritten.
>+_eval_for_side_effects := $(CHECK_MOZBUILD_VARIABLES)

>+# We may have modified "frozen" variables in rules.mk (we do that), but we don't
>+# want Makefile.in doing that, so collect the possibly modified variables here,
>+# and check them again in recurse.mk, which is always included after Makefile.in
>+# contents.
>+$(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))
>+$(foreach var,$(_DEPRECATED_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

It might be helpful to add a token of some kind in the comments to make it obvious which _eval_for_side_effects lines up with which $(foreach var...) block. Even something simple like adding "1st check" to the comments for the original {config/rules.mk, config/config.mk} version, and "2nd check" to these comments for the new {config/recurse.mk, config/rules.mk} version would help understanding. Aside from your comment here that mentions we "check them again in recurse.mk", it is a little hard to follow the overall strategy.

Comment 3

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8614bc69e290

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/8614bc69e290