Propagate the DEBUGGER flag to the Makefile for stage 2

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 96bed25..0f91a53 100644 (file)
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -28,7 +28,13 @@ SRC_HC_OPTS += -optl-Xlinker -optl-E
 endif
 
 ifeq "$(GhcWithInterpreter)" "YES"
 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 "$(GhcNotThreaded)" "YES"
 endif
 
 ifneq "$(GhcNotThreaded)" "YES"