X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=25a8a583414985c56829307eb8ac761ed947c1d2;hb=923ee9d360ed15331ac6faf8a6b4aca334fc0cee;hp=0ae9ff8b6ce24927162d3817a7f4273d1071b6c6;hpb=f2a25c5b02705aeb5f0138d5eb74c1919c29758c;p=ghc-hetmet.git

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 0ae9ff8..25a8a58 100644
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -9,27 +9,45 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-stage=2
-
+ifeq "$(stage)" "2"
 HC=$(GHC_STAGE1)
+endif
+
+ifeq "$(stage)" "3"
+HC=$(GHC_STAGE2)
+endif
+
 SRC_HC_OPTS += -package ghc
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -fno-generics -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser
+SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
+ifeq "$(TargetOS_CPP)" "openbsd"
+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"
 SRC_HC_OPTS += -threaded
+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
-
--include .depend-$(stage)