X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=0e3ce122cc093acc035f01f412f9b1cb16984a2a;hb=46b28f7bfdd535e9fe5217a1151bedfb2cc15472;hp=7b25fb3ce93915877facaf64baa82489947693dd;hpb=db6788f520b838417fbe062148d35d993f0e005f;p=ghc-hetmet.git

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 7b25fb3..0e3ce12 100644
--- 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