X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=13c7a863b7f68e3c420f1fd4bc401410372f62b7;hb=d19f868a2fbfb583e57d9c47b97c0cdb3a95ae57;hp=c8cd897a182f9ea73d705ec5666a59e9b74b4e4f;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index c8cd897..13c7a86 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -25,10 +25,27 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
+# -----------------------------------------------------------------------------
+# Misc bits
 
+# If $(way) is set then we define $(way_) and $(_way) from it in the
+# obvious fashion.  This must be done before suffix.mk is included,
+# because the pattern rules in that file depend on these variables.
 
-# 		Now follow the pieces of boilerplate
-#		The "-" signs tell make not to complain if they don't exist
+ifneq "$(way)" ""
+  way_ := $(way)_
+  _way := _$(way)
+endif
+
+
+# When using $(patsubst ...) and friends, you can't use a literal comma
+# freely - so we use ${comma} instead.  (See PACKAGE_CPP_OPTS in package.mk
+# for an example usage.)
+comma=,
+
+# -----------------------------------------------------------------------------
+# 	Now follow the pieces of boilerplate
+#	The "-" signs tell make not to complain if they don't exist
 
 include $(TOP)/mk/config.mk
 # All configuration information
@@ -46,13 +63,15 @@ include $(TOP)/mk/opts.mk
 # Variables that control the option flags for all the
 # language processors
 
-include $(TOP)/mk/suffix.mk
-# Suffix rules for Haskell, C and literate 
+ifeq "$(BootingFromHc)" "YES"
+include $(TOP)/mk/bootstrap.mk
+endif
 
 -include $(TOP)/mk/build.mk
 # (Optional) build-specific configuration
 #
 
+ifndef FAST
 -include .depend
+endif
 # The dependencies file from the current directory
-