build system incorrectly includes build.mk unconditionally

[nr@…]

./libraries/base/Makefile.local unconditionally includes $(TOP)/mk/build.mk when in fact it should do something more along the lines of the following:

ifeq "$(Validating)" "YES" include $(TOP)/mk/validate-settings.mk -include $(TOP)/mk/validate.mk else -include $(TOP)/mk/build.mk # (Optional) build-specific configuration # endif

This error causes validation to fail when build.mk contains -Werror, as there are things within libraries/base which have not yet been caused to be warning-clean.

Here is a subset of files that mention build.mk and may be worth investigating:

./configure.ac ./distrib/cross-port ./distrib/hc-build ./mk/boilerplate.mk ./mk/config.mk ./mk/config.mk.in ./mk/install.mk ./mk/build.mk ./mk/build.mk.sample ./bindisttest/Makefile ./compiler/ghci/keepCAFsForGHCi.c ./compiler/ilxGen/tests/Makefile ./compiler/ndpFlatten/TODO ./libraries/base/Makefile.local ./libraries/Makefile.local ./libraries/Makefile ./WindowsInstaller/MakeInstaller.txt ./Makefile

[igloo]

Thanks; we now consistently include via mk/custom-settings.mk, which contains the conditional includes.