X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=8e4f32247bc3ffe98b5c72ce9d5206a3dd381187;hb=6bfb3fcdbe0ee6080cb86a72518de1fd5646d610;hp=14194fbd223ff5ed862ebb5a6a7a97cf4be04166;hpb=0e86b6601ea17d89c7f46b3a902093d4c6020da8;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 14194fb..8e4f322 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -14,13 +14,7 @@
 # Setting .SUFFIXES to empty disables them all.
 MAKEFLAGS += --no-builtin-rules
 
-# 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) is the old name for $(TOP), kept for backwards compat
 FPTOOLS_TOP := $(TOP)
 
 
@@ -70,14 +64,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