X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=14194fbd223ff5ed862ebb5a6a7a97cf4be04166;hb=f2e6827708047873bc36004712655502d4602e8f;hp=94ba7d5743ec745a159b4d8610cc4de684a584d1;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 94ba7d5..14194fb 100644
--- 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