allow build settings to be overriden by adding mk/validate.mk

[ghc-hetmet.git] / compiler / Makefile.ghcbin

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 7b25fb3..0e3ce12 100644 (file)
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -28,15 +28,28 @@ SRC_HC_OPTS += -optl-Xlinker -optl-E
 endif
 
 ifeq "$(GhcWithInterpreter)" "YES"
-SRC_HC_OPTS += -DGHCI -DBREAKPOINT
+SRC_HC_OPTS += -DGHCI
+
+# Should the debugger commands be enabled?
+ifeq "$(GhciWithDebugger)" "YES"
+SRC_HC_OPTS += -DDEBUGGER
+endif
+
 endif
 
+ifneq "$(findstring thr, $(GhcRTSWays))" ""
+ifneq "$(GhcNotThreaded)" "YES"
 SRC_HC_OPTS += -threaded
+endif
+endif
 
 odir=stage$(stage)
 
 HS_SRCS = main/Main.hs
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 $(odir)/main/Main.o : libHSghc$(_way).a
+SRC_HC_OPTS += -fforce-recomp
+# can't rely on GHC's recompilation checking here, because it won't spot 
+# changes in the ghc package.
 
 include $(TOP)/mk/target.mk