Build settings for validation are now in mk/validate-settings.mk

[ghc-hetmet.git] / mk / boilerplate.mk

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 94ba7d5..14194fb 100644 (file)
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -14,10 +14,13 @@
 # Setting .SUFFIXES to empty disables them all.
 MAKEFLAGS += --no-builtin-rules
 
-# FPTOOLS_TOP is the *relative* path to the fptools toplevel directory from the
+# GHC_TOP is the *relative* path to the fptools toplevel directory from the
 # location where a project Makefile was invoked. It is set by looking at the
 # current value of TOP.
 #
+GHC_TOP := $(TOP)
+
+# $(FPTOOLS_TOP) is the old name for $(GHC_TOP), kept for backwards compat
 FPTOOLS_TOP := $(TOP)
 
 
@@ -67,9 +70,14 @@ 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
 
 ifndef FAST
 -include .depend