X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=379a725a283843cc92cbb5fc2bd8fe250c6f638c;hp=6d4cbc854e675f8e0ded2ec84a3b7732c8be6ae3;hb=e0b93c022e39d07b871e9ed97d40617eb6bee63a;hpb=49988937dc560c397bf95e310cc5536ac7967915

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 6d4cbc8..379a725 100644
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -9,21 +9,46 @@
 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 += -Wall
 SRC_HC_OPTS += -package ghc
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -fno-generics -Rghc-timing \
+  -cpp -fglasgow-exts -XNoGenerics -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)
 
@@ -31,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