projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Buggy optimizations caused function-call return to share the function's entry point
[ghc-hetmet.git]
/
mk
/
boilerplate.mk
diff --git
a/mk/boilerplate.mk
b/mk/boilerplate.mk
index
14194fb
..
0e7e752
100644
(file)
--- a/
mk/boilerplate.mk
+++ b/
mk/boilerplate.mk
@@
-14,13
+14,7
@@
# Setting .SUFFIXES to empty disables them all.
MAKEFLAGS += --no-builtin-rules
# 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)
FPTOOLS_TOP := $(TOP)
@@
-28,6
+22,15
@@
FPTOOLS_TOP := $(TOP)
# THIS RULE MUST REMAIN FIRST!
default: all
# THIS RULE MUST REMAIN FIRST!
default: all
+#------------------------------------------------------------
+# Makefile debugging
+# to see the effective value used for a Makefile variable, do
+# make show VALUE=MY_VALUE
+#
+
+show:
+ @echo '$(VALUE)="$($(VALUE))"'
+
# -----------------------------------------------------------------------------
# Misc bits
# -----------------------------------------------------------------------------
# Misc bits
@@
-70,14
+73,8
@@
ifeq "$(BootingFromHc)" "YES"
include $(TOP)/mk/bootstrap.mk
endif
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
# (Optional) build-specific configuration
-#
-endif
+include $(TOP)/mk/custom-settings.mk
ifndef FAST
-include .depend
ifndef FAST
-include .depend