X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=46dd5dc105521889e70b0e967987e540f56d5021;hp=d31c3e6d7dd2e582e797e733141af22ffb672daf;hb=11db0bc8cd2eee13339578ca447c0a2d97f453c3;hpb=118d0ea54667cd1a39a52867935dbacccb5e0257

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index d31c3e6..46dd5dc 100644
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -9,28 +9,55 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-stage=2
-
+ifeq "$(stage)" "2"
 HC=$(GHC_STAGE1)
+endif
+
+ifeq "$(stage)" "3"
+HC=$(GHC_STAGE2)
+endif
+
+EXCLUDED_C_SRCS += ghc-inplace.c
+
 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
+
+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)
 
 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
+WAYS=$(GhcCompilerWays)
 
--include .depend-$(stage)
+include $(TOP)/mk/target.mk