X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=cbee57a19d71bb102ca380ce1997e45b7428ad68;hb=0e7150a93803531c5214662f7b26109dcabb30b2;hp=96bed259af40682b2ee09c361be288eb2a6f30a5;hpb=680f11d3f1ad9065c4969ed5d9db857cc245d778;p=ghc-hetmet.git

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 96bed25..cbee57a 100644
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -17,6 +17,9 @@ ifeq "$(stage)" "3"
 HC=$(GHC_STAGE2)
 endif
 
+EXCLUDED_C_SRCS += ghc-inplace.c
+
+SRC_HC_OPTS += -Wall
 SRC_HC_OPTS += -package ghc
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
@@ -28,12 +31,24 @@ 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 "$(GhcNotThreaded)" "YES"
+ifeq "$(GhcThreaded)" "YES"
 SRC_HC_OPTS += -threaded
 endif
+ifeq "$(GhcProfiled)" "YES"
+SRC_HC_OPTS += -prof
+endif
+ifeq "$(GhcDebugged)" "YES"
+SRC_LD_OPTS += -debug
+endif
 
 odir=stage$(stage)
 
@@ -41,4 +56,6 @@ HS_SRCS = main/Main.hs
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 $(odir)/main/Main.o : libHSghc$(_way).a
 
+WAYS=$(GhcCompilerWays)
+
 include $(TOP)/mk/target.mk