Include build.mk or validate{,-settings}.mk through custom-settings.mk

diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index f5ac210..e3e1e8f 100644 (file)
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -1,15 +1,15 @@
 # Local GHC-build-tree customization for Cabal makefiles.  We want to build
-# libraries using flags that the user has put in build.mk.
+# libraries using flags that the user has put in build.mk/validate.mk.
 
 # Careful here: including boilerplate.mk breaks things, because paths.mk and
 # opts.mk overrides some of the variable settings in the Cabal Makefile, so
-# we just include config.mk and build.mk.
+# we just include config.mk and custom-settings.mk.
 TOP=../..
 SAVE_GHC := $(GHC)
 SAVE_AR  := $(AR)
 SAVE_LD  := $(LD)
 include $(TOP)/mk/config.mk
--include $(TOP)/mk/build.mk
+include $(TOP)/mk/custom-settings.mk
 GHC := $(SAVE_GHC)
 AR  := $(SAVE_AR)
 LD  := $(SAVE_LD)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 14194fb..5f31a25 100644 (file)
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -70,14 +70,8 @@ ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
 
-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
+include $(TOP)/mk/custom-settings.mk
 
 ifndef FAST
 -include .depend

diff --git a/mk/custom-settings.mk b/mk/custom-settings.mk
new file mode 100644 (file)
index 0000000..db8ebb4
--- /dev/null
+++ b/mk/custom-settings.mk
@@ -0,0 +1,7 @@
+
+ifeq "$(Validating)" "YES"
+include $(TOP)/mk/validate-settings.mk
+-include $(TOP)/mk/validate.mk
+else
+-include $(TOP)/mk/build.mk
+endif